From f2080ab8b41b5d58ef615e9127debaefe778242b Mon Sep 17 00:00:00 2001 From: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Sat, 28 Oct 2023 20:00:24 +0100 Subject: [PATCH] Revert "Save" This reverts commit d062956186c80b68be427c3fb3649f120af0ed61. --- dependencies.gradle | 2 +- src/main/java/com/colen/postea/Postea.java | 28 ++++++---- .../postea/mixins/IGameDataAccessor.java | 10 ---- .../postea/mixins/PosteaLoadingPlugin.java | 3 +- .../postea/mixins/early/MixinTileEntity.java | 3 +- .../postea/mixins/late/MixinGameData.java | 54 ------------------- src/main/resources/mixins.postea.late.json | 13 ----- 7 files changed, 22 insertions(+), 91 deletions(-) delete mode 100644 src/main/java/com/colen/postea/mixins/IGameDataAccessor.java delete mode 100644 src/main/java/com/colen/postea/mixins/late/MixinGameData.java delete mode 100644 src/main/resources/mixins.postea.late.json diff --git a/dependencies.gradle b/dependencies.gradle index fca978f..3ebc8cc 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -35,5 +35,5 @@ */ dependencies { api('com.github.GTNewHorizons:SpongePoweredMixin:0.8.5-GTNH-2:dev') - //api('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.30:dev') + api('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.30:dev') } diff --git a/src/main/java/com/colen/postea/Postea.java b/src/main/java/com/colen/postea/Postea.java index 23459a7..6348080 100644 --- a/src/main/java/com/colen/postea/Postea.java +++ b/src/main/java/com/colen/postea/Postea.java @@ -1,9 +1,18 @@ package com.colen.postea; +import appeng.block.networking.BlockController; +import appeng.core.Api; +import com.colen.postea.API.BlockReplacementManager; +import com.colen.postea.API.TileEntityReplacementManager; +import com.colen.postea.API.TileTransformer; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import gregtech.api.GregTech_API; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntityChest; import java.util.function.Function; @@ -14,20 +23,21 @@ public class Postea { @Mod.EventHandler public void preInit(FMLPreInitializationEvent event) { //ItemStackReplacementManager.addItemReplacement(Item.getItemFromBlock(Blocks.grass), 0, Item.getItemFromBlock(Blocks.coal_ore), 10); -// BlockReplacementManager.addBlockReplacement(GregTech_API.sBlockOres1, 6, Blocks.emerald_ore, 0); -// BlockReplacementManager.addBlockReplacement(GregTech_API.sBlockOres1, 16022, Blocks.nether_brick, 0); -// BlockReplacementManager.addBlockReplacement(GregTech_API.sBlockOres1, 1018, Blocks.end_stone, 0); + BlockReplacementManager.addBlockReplacement(GregTech_API.sBlockOres1, 6, Blocks.emerald_ore, 0); + BlockReplacementManager.addBlockReplacement(GregTech_API.sBlockOres1, 16022, Blocks.nether_brick, 0); + BlockReplacementManager.addBlockReplacement(GregTech_API.sBlockOres1, 1018, Blocks.end_stone, 0); - } - - @Mod.EventHandler - public void postInit(FMLPostInitializationEvent event) { // Define the transformation function Function myTransformer = (tag) -> { return tag; }; -// TileEntityReplacementManager.tileEntityReplacement("GT_TileEntity_Ores", new TileTransformer(TileEntityChest.class, myTransformer)); -// BlockReplacementManager.addBlockReplacement(GregTech_API.sBlockOres1, 0, Blocks.chest, 0); + TileEntityReplacementManager.tileEntityReplacement("GT_TileEntity_Ores", new TileTransformer(TileEntityChest.class, myTransformer)); + + } + + @Mod.EventHandler + public void postInit(FMLPostInitializationEvent event) { + BlockReplacementManager.addBlockReplacement(GregTech_API.sBlockOres1, 0, Blocks.chest, 0); } } diff --git a/src/main/java/com/colen/postea/mixins/IGameDataAccessor.java b/src/main/java/com/colen/postea/mixins/IGameDataAccessor.java deleted file mode 100644 index bf8996a..0000000 --- a/src/main/java/com/colen/postea/mixins/IGameDataAccessor.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.colen.postea.mixins; - -import cpw.mods.fml.common.registry.FMLControlledNamespacedRegistry; -import net.minecraft.block.Block; -import net.minecraft.item.Item; - -public interface IGameDataAccessor { - FMLControlledNamespacedRegistry getIBlockRegistry(); - FMLControlledNamespacedRegistry getIItemRegistry(); -} diff --git a/src/main/java/com/colen/postea/mixins/PosteaLoadingPlugin.java b/src/main/java/com/colen/postea/mixins/PosteaLoadingPlugin.java index 06bc1fa..36d36dd 100644 --- a/src/main/java/com/colen/postea/mixins/PosteaLoadingPlugin.java +++ b/src/main/java/com/colen/postea/mixins/PosteaLoadingPlugin.java @@ -37,7 +37,7 @@ public final class PosteaLoadingPlugin implements IEarlyMixinLoader, IFMLLoading @Override public String getMixinConfig() { - return "mixins.postea.json"; + return "mixins.postea.early.json"; } @Override @@ -47,7 +47,6 @@ public final class PosteaLoadingPlugin implements IEarlyMixinLoader, IFMLLoading mixins.add("MixinChunkProviderServer"); mixins.add("MixinAnvilChunkLoader"); mixins.add("MixinTileEntity"); - mixins.add("MixinGameData"); return mixins; } diff --git a/src/main/java/com/colen/postea/mixins/early/MixinTileEntity.java b/src/main/java/com/colen/postea/mixins/early/MixinTileEntity.java index bb9819b..df274a3 100644 --- a/src/main/java/com/colen/postea/mixins/early/MixinTileEntity.java +++ b/src/main/java/com/colen/postea/mixins/early/MixinTileEntity.java @@ -29,8 +29,7 @@ public class MixinTileEntity { /** - * @author Colen - * @reason Stuff + * Creates a new entity and loads its data from the specified NBT. */ @Overwrite @SuppressWarnings("unused") diff --git a/src/main/java/com/colen/postea/mixins/late/MixinGameData.java b/src/main/java/com/colen/postea/mixins/late/MixinGameData.java deleted file mode 100644 index cc5dc3e..0000000 --- a/src/main/java/com/colen/postea/mixins/late/MixinGameData.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.colen.postea.mixins.late; - -import com.colen.postea.mixins.IGameDataAccessor; -import cpw.mods.fml.common.registry.FMLControlledNamespacedRegistry; -import cpw.mods.fml.common.registry.GameData; -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Overwrite; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.Unique; - -@Mixin(GameData.class) -public class MixinGameData implements IGameDataAccessor { - - @Unique - protected native static GameData getMain(); - @Shadow(remap = false) - private static FMLControlledNamespacedRegistry iBlockRegistry; - @Shadow(remap = false) - private static FMLControlledNamespacedRegistry iItemRegistry; - - @Override - public FMLControlledNamespacedRegistry getIBlockRegistry() { - return iBlockRegistry; - } - - @Override - public FMLControlledNamespacedRegistry getIItemRegistry() { - return iItemRegistry; - } - - /** - * @author Colen - * @reason Stuff - */ - @Overwrite(remap = false) - static Item findItem(String modId, String name) { - IGameDataAccessor accessor = (IGameDataAccessor) getMain(); - return accessor.getIItemRegistry().getObject(modId + ":" + name); - } - - /** - * @author Colen - * @reason Stuff - */ - @Overwrite(remap = false) - static Block findBlock(String modId, String name) { - String key = "minecraft:bedrock"; - IGameDataAccessor accessor = (IGameDataAccessor) getMain(); - return accessor.getIBlockRegistry().containsKey(key) ? accessor.getIBlockRegistry().getObject(key) : null; - } - -} diff --git a/src/main/resources/mixins.postea.late.json b/src/main/resources/mixins.postea.late.json deleted file mode 100644 index 5794c6f..0000000 --- a/src/main/resources/mixins.postea.late.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "required": true, - "minVersion": "0.8.5-GTNH", - "package": "com.colen.postea.mixins.late", - "refmap": "mixins.postea.refmap.json", - "target": "@env(DEFAULT)", - "compatibilityLevel": "JAVA_8", - "mixins": [ - "MixinGameData" - ], - "client": [], - "server": [] -}