updated deps, removed amethyst shards from amethyst gem tag

GregTech-Intergalactical · Sep 3, 2023 · 979b783 · 979b783
1 parent 64e30ee
commit 979b783
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 4 deletions.
diff --git a/AntimatterAPI b/AntimatterAPI
diff --git a/common/build.gradle b/common/build.gradle
@@ -32,6 +32,7 @@ dependencies{
     implementation("com.github.FeltMC:forgeconfigapiport-fabric:c1486f80f7"){
         transitive = false
     }
+    modCompileOnly("curse.maven:terrafirmacraft-302973:4723717")
 }
 
 architectury {

diff --git a/common/src/main/java/muramasa/gregtech/datagen/GregTechItemTagProvider.java b/common/src/main/java/muramasa/gregtech/datagen/GregTechItemTagProvider.java
@@ -40,6 +40,8 @@ protected void processTags(String domain) {
         this.tag(TRANSISTORS).add(Transistor, SMDTransistor);
         this.tag(DIODES).add(Diode, SMDDiode);
         this.tag(GEM.getMaterialTag(Amethyst)).remove(Items.AMETHYST_SHARD);
+        this.tag(GEM.getTag()).remove(Items.AMETHYST_SHARD);
+        this.tag(BLOCK.getMaterialTag(Amethyst)).remove(Items.AMETHYST_BLOCK);
         this.tag(GEM.getMaterialTag(Quartz)).add(GEM.get(MilkyQuartz));
         this.tag(PLATES_IRON_ALUMINIUM).addTag(PLATE.getMaterialTag(Iron)).addTag(PLATE.getMaterialTag(WroughtIron)).addTag(PLATE.getMaterialTag(Aluminium));
         this.tag(DUST_LAPIS_LAZURITE).addTag(DUST.getMaterialTag(Lapis)).addTag(DUST.getMaterialTag(Lazurite));

diff --git a/common/src/main/java/muramasa/gregtech/integration/tfc/TFCRegistrar.java b/common/src/main/java/muramasa/gregtech/integration/tfc/TFCRegistrar.java
@@ -0,0 +1,29 @@
+package muramasa.gregtech.integration.tfc;
+
+import muramasa.antimatter.AntimatterAPI;
+import muramasa.antimatter.Ref;
+import muramasa.antimatter.registration.IAntimatterRegistrar;
+import muramasa.antimatter.registration.RegistrationEvent;
+import muramasa.antimatter.registration.Side;
+
+public class TFCRegistrar implements IAntimatterRegistrar {
+    @Override
+    public String getId() {
+        return "tfc";
+    }
+
+    @Override
+    public void onRegistrationEvent(RegistrationEvent event, Side side) {
+
+    }
+
+    @Override
+    public void onRegistrarInit() {
+
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return AntimatterAPI.isModLoaded("tfc");
+    }
+}
diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx5G
 org.gradle.daemon=false
 org.gradle.parallel=true
 
-mod_version=0.2-alpha-47
+mod_version=0.2-alpha-51
 archive_base_name=gti
 modid=gregtech
 
@@ -15,8 +15,8 @@ fabric_api_version=0.76.0+1.18.2
 fabric_transfer_api_version=1.6.+
 fabric_loader_version=0.14.6
 
-gt_rubber_version=0.2.3-rc3
-gt_utility_version=0.1-pre12
+gt_rubber_version=0.2.3-rc4
+gt_utility_version=0.1-pre13
 terraform_version=3.1.4
 networkapi_version=0.1.1-rc2
 jei_version=10.2.1.1004
+1 −1		common/gradle.properties
+1 −0		common/src/main/java/muramasa/antimatter/data/AntimatterMaterialTypes.java
+96 −0		common/src/main/java/muramasa/antimatter/datagen/builder/AntimatterTagBuilder.java
+6 −5		common/src/main/java/muramasa/antimatter/datagen/providers/AntimatterItemTagProvider.java
+23 −11		common/src/main/java/muramasa/antimatter/datagen/providers/AntimatterTagProvider.java
+61 −0		common/src/main/java/muramasa/antimatter/mixin/TagLoaderMixin.java
+2 −1		common/src/main/resources/antimatter.mixins.json
+1 −1		fabric/gradle.properties
+1 −1		forge/gradle.properties