updated antimatter and gt core

GT-Reimagined · Feb 28, 2024 · 675be21 · 675be21
1 parent 393a143
commit 675be21
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 7 deletions.
diff --git a/AntimatterAPI b/AntimatterAPI
diff --git a/common/src/main/java/trinsdar/gt4r/loader/crafting/ModCompatRecipes.java b/common/src/main/java/trinsdar/gt4r/loader/crafting/ModCompatRecipes.java
@@ -15,7 +15,7 @@
 public class ModCompatRecipes {
 
     public static void loadIE(Consumer<FinishedRecipe> output, AntimatterRecipeProvider provider){
-        provider.addStackRecipe(output, GT4RRef.ID, "treated_wood", "mod_compat", "has_wood", provider.hasSafeItem(ItemTags.PLANKS), new ItemStack(AntimatterPlatformUtils.getBlockFromId(new ResourceLocation(GT4RRef.MOD_IE, "treated_wood_horizontal")), 8), ImmutableMap.of('P', ItemTags.PLANKS, 'C', Materials.Creosote.getLiquid().getBucket()), "PPP", "PCP", "PPP");
+        provider.addStackRecipe(output, GT4RRef.ID, "treated_wood", "mod_compat", new ItemStack(AntimatterPlatformUtils.getBlockFromId(new ResourceLocation(GT4RRef.MOD_IE, "treated_wood_horizontal")), 8), ImmutableMap.of('P', ItemTags.PLANKS, 'C', Materials.Creosote.getLiquid().getBucket()), "PPP", "PCP", "PPP");
     }
 
 }
diff --git a/common/src/main/java/trinsdar/gt4r/loader/machines/CentrifugingLoader.java b/common/src/main/java/trinsdar/gt4r/loader/machines/CentrifugingLoader.java
@@ -160,8 +160,6 @@ private static FluidHolder getFluid(Material mat, int amount){
             return mat.getLiquid(amount);
         } else if (mat.has(AntimatterMaterialTypes.GAS)){
             return mat.getGas(amount);
-        } else if (mat.has(AntimatterMaterialTypes.PLASMA)){
-            return mat.getPlasma(amount);
         } else {
             return mat.getLiquid(amount);
         }

diff --git a/common/src/main/java/trinsdar/gt4r/loader/machines/ElectrolyzerLoader.java b/common/src/main/java/trinsdar/gt4r/loader/machines/ElectrolyzerLoader.java
@@ -88,8 +88,6 @@ private static FluidHolder getFluid(Material mat, int amount){
             return mat.getLiquid(amount);
         } else if (mat.has(GAS)){
             return mat.getGas(amount);
-        } else if (mat.has(AntimatterMaterialTypes.PLASMA)){
-            return mat.getPlasma(amount);
         } else {
             return mat.getLiquid(amount);
         }

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-pre15
+gt_core_version=0.1.1-pre18
 terraform_version=3.1.4
 jei_version=10.1.0.223
 crafttweaker_version=9.1.90
+1 −1		TesseractAPI
+1 −1		common/gradle.properties
+2 −8		common/src/main/java/muramasa/antimatter/Antimatter.java
+5 −1		common/src/main/java/muramasa/antimatter/AntimatterConfig.java
+4 −6		common/src/main/java/muramasa/antimatter/MaterialDataInit.java
+0 −1		common/src/main/java/muramasa/antimatter/Ref.java
+3 −8		common/src/main/java/muramasa/antimatter/block/BlockMaterialType.java
+12 −12		common/src/main/java/muramasa/antimatter/block/BlockSurfaceRock.java
+33 −0		common/src/main/java/muramasa/antimatter/blockentity/BlockEntityBase.java
+1 −0		common/src/main/java/muramasa/antimatter/blockentity/BlockEntityMachine.java
+10 −1		common/src/main/java/muramasa/antimatter/blockentity/multi/BlockEntityHatch.java
+2 −6		common/src/main/java/muramasa/antimatter/blockentity/pipe/BlockEntityFluidPipe.java
+247 −28		common/src/main/java/muramasa/antimatter/blockentity/pipe/BlockEntityItemPipe.java
+47 −15		common/src/main/java/muramasa/antimatter/blockentity/pipe/BlockEntityPipe.java
+5 −0		common/src/main/java/muramasa/antimatter/capability/CoverHandler.java
+2 −2		common/src/main/java/muramasa/antimatter/capability/item/SidedCombinedInvWrapper.java
+5 −4		common/src/main/java/muramasa/antimatter/capability/machine/MachineCoverHandler.java
+3 −0		common/src/main/java/muramasa/antimatter/capability/machine/MachineRecipeHandler.java
+22 −1		common/src/main/java/muramasa/antimatter/capability/machine/MultiMachineFluidHandler.java
+35 −0		common/src/main/java/muramasa/antimatter/capability/pipe/PipeItemHandler.java
+4 −0		common/src/main/java/muramasa/antimatter/cover/ICover.java
+1 −0		common/src/main/java/muramasa/antimatter/data/AntimatterDefaultTools.java
+22 −16		common/src/main/java/muramasa/antimatter/data/AntimatterMaterialTypes.java
+14 −4		common/src/main/java/muramasa/antimatter/datagen/loaders/StoneRecipes.java
+17 −5		common/src/main/java/muramasa/antimatter/datagen/providers/AntimatterBlockLootProvider.java
+3 −0		common/src/main/java/muramasa/antimatter/datagen/providers/AntimatterBlockTagProvider.java
+1 −0		common/src/main/java/muramasa/antimatter/datagen/providers/AntimatterItemTagProvider.java
+7 −3		common/src/main/java/muramasa/antimatter/datagen/providers/AntimatterLanguageProvider.java
+5 −17		common/src/main/java/muramasa/antimatter/event/MaterialEvent.java
+6 −1		common/src/main/java/muramasa/antimatter/event/WorldGenEvent.java
+14 −17		common/src/main/java/muramasa/antimatter/fluid/AntimatterMaterialFluid.java
+3 −8		common/src/main/java/muramasa/antimatter/integration/rei/AntimatterREIClientPlugin.java
+0 −1		common/src/main/java/muramasa/antimatter/item/ItemBattery.java
+9 −8		common/src/main/java/muramasa/antimatter/item/ScannerItem.java
+24 −1		common/src/main/java/muramasa/antimatter/machine/BlockMachine.java
+12 −0		common/src/main/java/muramasa/antimatter/machine/IMachineColorHandlerBlock.java
+14 −0		common/src/main/java/muramasa/antimatter/machine/IMachineColorHandlerItem.java
+1 −1		common/src/main/java/muramasa/antimatter/machine/types/HatchMachine.java
+17 −2		common/src/main/java/muramasa/antimatter/machine/types/Machine.java
+0 −19		common/src/main/java/muramasa/antimatter/material/Material.java
+10 −8		common/src/main/java/muramasa/antimatter/material/MaterialItem.java
+1 −0		common/src/main/java/muramasa/antimatter/material/MaterialTags.java
+60 −2		common/src/main/java/muramasa/antimatter/pipe/BlockItemPipe.java
+13 −5		common/src/main/java/muramasa/antimatter/pipe/BlockPipe.java
+2 −2		common/src/main/java/muramasa/antimatter/tool/behaviour/BehaviourExtendedHighlight.java
+20 −0		common/src/main/java/muramasa/antimatter/util/CodeUtils.java
+76 −29		common/src/main/java/muramasa/antimatter/worldgen/StoneLayerOre.java
+129 −124		common/src/main/java/muramasa/antimatter/worldgen/WorldGenHelper.java
+24 −2		common/src/main/java/muramasa/antimatter/worldgen/feature/FeatureSmallOres.java
+66 −12		common/src/main/java/muramasa/antimatter/worldgen/feature/FeatureStoneLayer.java
+24 −2		common/src/main/java/muramasa/antimatter/worldgen/feature/FeatureVanillaOres.java
+3 −3		common/src/main/java/muramasa/antimatter/worldgen/object/WorldGenStoneLayer.java
+1 −0		common/src/main/java/muramasa/antimatter/worldgen/object/WorldGenStoneLayerBuilder.java
+ −		common/src/main/resources/assets/antimatter/textures/material/bearing_rock.png
+ −		common/src/main/resources/assets/antimatter/textures/material/bearing_rock_overlay.png
+ −		common/src/main/resources/assets/antimatter/textures/material/breeder_fuel.png
+ −		common/src/main/resources/assets/antimatter/textures/material/breeder_fuel_overlay.png
+ −		common/src/main/resources/assets/antimatter/textures/material/depleted_breeder_fuel.png
+ −		common/src/main/resources/assets/antimatter/textures/material/depleted_breeder_fuel_overlay.png
+ −		common/src/main/resources/assets/antimatter/textures/material/depleted_fissile_fuel.png
+ −		common/src/main/resources/assets/antimatter/textures/material/depleted_fissile_fuel_overlay.png
+ −		common/src/main/resources/assets/antimatter/textures/material/fissile_fuel.png
+ −		common/src/main/resources/assets/antimatter/textures/material/fissile_fuel_overlay.png
+ −		common/src/main/resources/assets/antimatter/textures/material/magnetic/bearing_rock.png
+ −		common/src/main/resources/assets/antimatter/textures/material/magnetic/bearing_rock_overlay.png
+ −		common/src/main/resources/assets/antimatter/textures/material/magnetic/rock.png
+ −		common/src/main/resources/assets/antimatter/textures/material/magnetic/rock_overlay.png
+ −		common/src/main/resources/assets/antimatter/textures/material/rock.png
+ −		common/src/main/resources/assets/antimatter/textures/material/rock_overlay.png
+ −		common/src/main/resources/assets/antimatter/textures/material/surface_rock_overlay.png
+1 −1		fabric/gradle.properties
+1 −1		fabric/src/main/java/muramasa/antimatter/fabric/AntimatterAPIImpl.java
+1 −1		forge/gradle.properties
+7 −0		forge/src/main/java/muramasa/antimatter/common/event/forge/ForgeCommonEvents.java
+8 −7		forge/src/main/java/muramasa/antimatter/mixin/forge/BlockEntityPipeMixin.java