Skip to content

Commit 9b655b6

Browse files
author
Smartin
committed
- fix for forge bug
1 parent 55b2c30 commit 9b655b6

File tree

7 files changed

+23
-4
lines changed

7 files changed

+23
-4
lines changed

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
## v1.0.11 (1.20.1)
2-
- fixes to miapis Conditionsystem caused by last update
1+
## v1.0.12 (1.20.1)
2+
- fixes startup crash on forge

common/src/main/java/smartin/miapi/modules/material/GeneratedMaterial.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,11 @@ public Map<ModuleProperty, JsonElement> materialProperties(String key) {
346346
return new HashMap<>();
347347
}
348348

349+
@Override
350+
public List<String> getAllPropertyKeys() {
351+
return new ArrayList<>();
352+
}
353+
349354
@Override
350355
public double getDouble(String property) {
351356
if (materialStats.containsKey(property)) {

common/src/main/java/smartin/miapi/modules/material/JsonMaterial.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,15 @@ public Map<ModuleProperty, JsonElement> materialProperties(String key) {
9292
return propertyMap;
9393
}
9494

95+
@Override
96+
public List<String> getAllPropertyKeys() {
97+
JsonElement propertyElement = rawJson.getAsJsonObject().get("properties");
98+
if (propertyElement != null) {
99+
return new ArrayList<>(propertyElement.getAsJsonObject().keySet());
100+
}
101+
return new ArrayList<>();
102+
}
103+
95104
public JsonElement getRawElement(String key) {
96105
return rawJson.getAsJsonObject().get(key);
97106
}

common/src/main/java/smartin/miapi/modules/material/Material.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ default boolean hasIcon() {
6969

7070
Map<ModuleProperty, JsonElement> materialProperties(String key);
7171

72+
List<String> getAllPropertyKeys();
73+
7274
double getDouble(String property);
7375

7476
String getData(String property);

common/src/main/java/smartin/miapi/modules/material/MaterialProperties.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ public MaterialProperties() {
4343
});
4444
}
4545

46+
public static void getMap(Material material){
47+
48+
}
49+
4650
@Override
4751
public boolean load(String moduleKey, JsonElement data) throws Exception {
4852
return true;

forge/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ processResources {
8585

8686
shadowJar {
8787
exclude "fabric.mod.json"
88-
exclude "architectury.common.json"
8988

9089
configurations = [project.configurations.shadowCommon]
9190
archiveClassifier = "dev-shadow"

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx3G
33
minecraft_version=1.20.1
44

55
archives_base_name=Truly-Modular-miapi
6-
mod_version=1.0.11
6+
mod_version=1.0.12
77
maven_group=smartin
88
github=Truly-Modular.Modular-Item-API
99

0 commit comments

Comments
 (0)