updated antimatter and gt core

GT-Reimagined · Jan 18, 2024 · e0d0f02 · e0d0f02
1 parent a033157
commit e0d0f02
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/AntimatterAPI b/AntimatterAPI
diff --git a/common/src/main/java/trinsdar/gt4r/loader/crafting/Parts.java b/common/src/main/java/trinsdar/gt4r/loader/crafting/Parts.java
@@ -106,7 +106,7 @@ public static void loadRecipes(Consumer<FinishedRecipe> output, AntimatterRecipe
         provider.addItemRecipe(output, GT4RRef.ID, "block_shape", "parts", "has_wire_cutter", provider.hasSafeItem(AntimatterDefaultTools.WIRE_CUTTER.getTag()),
                 ShapeBlock, of('W', AntimatterDefaultTools.WIRE_CUTTER.getTag(), 'P', EmptyShape), "P W");
         provider.addItemRecipe(output, GT4RRef.ID, "sword_head_shape", "parts", "has_wire_cutter", provider.hasSafeItem(AntimatterDefaultTools.WIRE_CUTTER.getTag()),
-                ShapeHeadSword, of('W', AntimatterDefaultTools.WIRE_CUTTER.getTag(), 'P', EmptyShape), "P", " ", "W");
+                ShapeBladeSword, of('W', AntimatterDefaultTools.WIRE_CUTTER.getTag(), 'P', EmptyShape), "P", " ", "W");
         provider.addItemRecipe(output, GT4RRef.ID, "pickaxe_head_shape", "parts", "has_wire_cutter", provider.hasSafeItem(AntimatterDefaultTools.WIRE_CUTTER.getTag()),
                 ShapeHeadPickaxe, of('W', AntimatterDefaultTools.WIRE_CUTTER.getTag(), 'P', EmptyShape), " P", "  ", "W ");
         provider.addItemRecipe(output, GT4RRef.ID, "shovel_head_shape", "parts", "has_wire_cutter", provider.hasSafeItem(AntimatterDefaultTools.WIRE_CUTTER.getTag()),
@@ -120,7 +120,7 @@ public static void loadRecipes(Consumer<FinishedRecipe> output, AntimatterRecipe
         provider.addItemRecipe(output, GT4RRef.ID, "file_head_shape", "parts", "has_wire_cutter", provider.hasSafeItem(AntimatterDefaultTools.WIRE_CUTTER.getTag()),
                 ShapeHeadFile, of('W', AntimatterDefaultTools.WIRE_CUTTER.getTag(), 'P', EmptyShape), "W  ", "   ", "  P");
         provider.addItemRecipe(output, GT4RRef.ID, "saw_head_shape", "parts", "has_wire_cutter", provider.hasSafeItem(AntimatterDefaultTools.WIRE_CUTTER.getTag()),
-                ShapeHeadSaw, of('W', AntimatterDefaultTools.WIRE_CUTTER.getTag(), 'P', EmptyShape), "W ", "  ", " P");
+                ShapeBladeSaw, of('W', AntimatterDefaultTools.WIRE_CUTTER.getTag(), 'P', EmptyShape), "W ", "  ", " P");
         provider.addItemRecipe(output, GT4RRef.ID, "gear_shape", "parts", "has_wire_cutter", provider.hasSafeItem(AntimatterDefaultTools.WIRE_CUTTER.getTag()),
                 ShapeGear, of('W', AntimatterDefaultTools.WIRE_CUTTER.getTag(), 'P', EmptyShape), "W", " ", "P");
         /*provider.addItemRecipe(output, GT4RRef.ID, "bottle_shape", "parts", "has_wire_cutter", provider.hasSafeItem(AntimatterDefaultTools.WIRE_CUTTER.getTag()),

diff --git a/gradle.properties b/gradle.properties
@@ -15,7 +15,7 @@ fabric_api_version=0.76.0+1.18.2
 fabric_transfer_api_version=1.6.+
 fabric_loader_version=0.14.6
 
-gt_core_version=0.1.1-pre7
+gt_core_version=0.1.1-pre15
 terraform_version=3.1.4
 jei_version=10.1.0.223
 crafttweaker_version=9.1.90
+1 −1		common/gradle.properties
+1 −1		common/src/main/java/muramasa/antimatter/MaterialDataInit.java
+2 −0		common/src/main/java/muramasa/antimatter/Ref.java
+2 −2		common/src/main/java/muramasa/antimatter/block/BlockBasicSlab.java
+2 −1		common/src/main/java/muramasa/antimatter/block/BlockMaterialType.java
+2 −1		common/src/main/java/muramasa/antimatter/block/BlockSurfaceRock.java
+7 −1		common/src/main/java/muramasa/antimatter/blockentity/BlockEntityBase.java
+49 −0		common/src/main/java/muramasa/antimatter/blockentity/BlockEntityCache.java
+8 −13		common/src/main/java/muramasa/antimatter/blockentity/BlockEntityMachine.java
+6 −1		common/src/main/java/muramasa/antimatter/blockentity/BlockEntityTickable.java
+14 −0		common/src/main/java/muramasa/antimatter/blockentity/IPostTickTile.java
+14 −0		common/src/main/java/muramasa/antimatter/blockentity/IPreTickTile.java
+0 −9		common/src/main/java/muramasa/antimatter/blockentity/multi/BlockEntityBasicMultiMachine.java
+10 −15		common/src/main/java/muramasa/antimatter/blockentity/multi/BlockEntityHatch.java
+2 −1		common/src/main/java/muramasa/antimatter/blockentity/pipe/BlockEntityCable.java
+13 −11		common/src/main/java/muramasa/antimatter/blockentity/pipe/BlockEntityFluidPipe.java
+2 −1		common/src/main/java/muramasa/antimatter/blockentity/pipe/BlockEntityItemPipe.java
+6 −4		common/src/main/java/muramasa/antimatter/blockentity/pipe/BlockEntityPipe.java
+4 −10		common/src/main/java/muramasa/antimatter/blockentity/single/BlockEntityGenerator.java
+2 −1		common/src/main/java/muramasa/antimatter/capability/CoverHandler.java
+16 −3		common/src/main/java/muramasa/antimatter/capability/machine/DefaultHeatHandler.java
+4 −2		common/src/main/java/muramasa/antimatter/capability/machine/MachineEnergyHandler.java
+11 −7		common/src/main/java/muramasa/antimatter/capability/machine/MachineItemHandler.java
+5 −7		common/src/main/java/muramasa/antimatter/capability/machine/MachineRecipeHandler.java
+2 −2		common/src/main/java/muramasa/antimatter/capability/pipe/PipeCoverHandler.java
+4 −3		common/src/main/java/muramasa/antimatter/client/baked/MachineBakedModel.java
+1 −1		common/src/main/java/muramasa/antimatter/client/event/ClientEvents.java
+1 −1		common/src/main/java/muramasa/antimatter/client/tesr/MachineTESR.java
+6 −0		common/src/main/java/muramasa/antimatter/cover/CoverDynamo.java
+5 −4		common/src/main/java/muramasa/antimatter/cover/CoverEnergy.java
+3 −5		common/src/main/java/muramasa/antimatter/cover/CoverOutput.java
+3 −1		common/src/main/java/muramasa/antimatter/cover/ICover.java
+3 −1		common/src/main/java/muramasa/antimatter/data/AntimatterDefaultTools.java
+3 −5		common/src/main/java/muramasa/antimatter/data/AntimatterMaterialTypes.java
+3 −0		common/src/main/java/muramasa/antimatter/data/AntimatterTags.java
+4 −0		common/src/main/java/muramasa/antimatter/datagen/providers/AntimatterRecipeProvider.java
+5 −0		common/src/main/java/muramasa/antimatter/entity/IRadiationEntity.java
+2 −3		common/src/main/java/muramasa/antimatter/gui/slot/AbstractSlot.java
+4 −0		common/src/main/java/muramasa/antimatter/integration/jeirei/AntimatterJEIREIPlugin.java
+26 −18		common/src/main/java/muramasa/antimatter/machine/BlockMachine.java
+2 −4		common/src/main/java/muramasa/antimatter/machine/BlockMultiMachine.java
+12 −0		common/src/main/java/muramasa/antimatter/machine/IShapeGetter.java
+2 −1		common/src/main/java/muramasa/antimatter/machine/types/HatchMachine.java
+43 −2		common/src/main/java/muramasa/antimatter/machine/types/Machine.java
+5 −0		common/src/main/java/muramasa/antimatter/material/IMaterialObject.java
+9 −4		common/src/main/java/muramasa/antimatter/material/Material.java
+32 −2		common/src/main/java/muramasa/antimatter/material/MaterialItem.java
+4 −1		common/src/main/java/muramasa/antimatter/material/MaterialTags.java
+79 −0		common/src/main/java/muramasa/antimatter/mixin/LivingEntityMixin.java
+2 −1		common/src/main/java/muramasa/antimatter/ore/BlockMaterialStone.java
+7 −1		common/src/main/java/muramasa/antimatter/pipe/BlockPipe.java
+0 −49		common/src/main/java/muramasa/antimatter/pipe/FluidPipeTicker.java
+101 −0		common/src/main/java/muramasa/antimatter/pipe/TileTicker.java
+1 −1		common/src/main/java/muramasa/antimatter/tool/IAntimatterTool.java
+2 −3		common/src/main/java/muramasa/antimatter/tool/behaviour/BehaviourAOEBreak.java
+65 −0		common/src/main/java/muramasa/antimatter/tool/behaviour/BehaviourCropHarvesting.java
+7 −0		common/src/main/java/muramasa/antimatter/tool/behaviour/BehaviourExtendedHighlight.java
+12 −6		common/src/main/java/muramasa/antimatter/tool/behaviour/BehaviourLogStripping.java
+2 −3		common/src/main/java/muramasa/antimatter/tool/behaviour/BehaviourTreeFelling.java
+34 −0		common/src/main/java/muramasa/antimatter/util/CodeUtils.java
+58 −54		common/src/main/java/muramasa/antimatter/util/Utils.java
+1 −0		common/src/main/resources/antimatter.mixins.json
+18 −0		common/src/main/resources/assets/antimatter/models/block/slab.json
+18 −0		common/src/main/resources/assets/antimatter/models/block/slab_top.json
+ −		common/src/main/resources/assets/antimatter/textures/material/magnetic/scythe_blade.png
+ −		common/src/main/resources/assets/antimatter/textures/material/magnetic/scythe_blade_overlay.png
+ −		common/src/main/resources/assets/antimatter/textures/material/scythe_blade.png
+ −		common/src/main/resources/assets/antimatter/textures/material/scythe_blade_overlay.png
+1 −1		fabric/gradle.properties
+3 −2		fabric/src/main/java/muramasa/antimatter/fabric/AntimatterImpl.java
+1 −1		forge/gradle.properties
+2 −5		forge/src/main/java/muramasa/antimatter/common/event/forge/ForgeCommonEvents.java