From 8a581938862a4d612f510a8afed88727a34c3916 Mon Sep 17 00:00:00 2001 From: Jakub <53441451+kuba6000@users.noreply.github.com> Date: Thu, 15 Dec 2022 16:53:12 +0100 Subject: MODULAR UI (#34) * MODULAR UUUUUUUUIIIIIIIIIII * Tea * Add recipe to ULTIMATE TEA * Stupid MT Scripts. I hate it * Yeet * More TEA * Add blocks * More Modular UIs * Textures * Fix custom UI containers * Texture, tooltip * UI with tabs * ButtonWidget * fix * Fix * Texture * Color is fixed * More UI work * Modular UI is hard dependency now * Spotless * Simplify * Format numbers * A * Update TeaAcceptorTile.java * Shadow is fixed, lets gooooo * hardness * Mixins mixins mixins * Tab icons * Fix crash * Shop concept * Bump ModularUI * Bump Modular UI * Nooooooooooo * GREY -> GRAY * Bump ModularUI * Bump GT5 * EEC with MUI test * Include incomplete structure * REFLECTIONS !! * Just use slot filter * Update pos when needed * Update GT_MetaTileEntity_ExtremeExterminationChamber.java * Spawner status * Nice toggle button * Send messages * Next toggle button * Start work on IAADDS * Scrollable inventory test * Draw queen slots * Fix * Update dependencies.gradle * Use sync widget * Add button to enable/disable working * Configuration in Mega Apiary * Refactor a bit * Update ModularUI * Bump ModularUI * Bump GT5 * Fix build * Update dependencies.gradle * Update build.gradle * Update dependencies.gradle * spotless * Begin working on configuration window * Update dependencies.gradle * Deprecated * Update dependencies.gradle * Optimize bee storage rendering (2 fps -> 100 fps) * Make Mega Apiary storage GUI usable * Configuration window looks ok * Color is fixed * TC research * Disable for now * Finish tea command * ok * Fix * Update en_US.lang * ZzZ * Stuff changed --- src/main/java/kubatech/CommonProxy.java | 20 +- src/main/java/kubatech/api/LoaderReference.java | 2 + src/main/java/kubatech/api/enums/ItemList.java | 3 +- .../kubatech/api/helpers/ReflectionHelper.java | 34 +++ .../api/network/CustomTileEntityPacket.java | 6 +- .../kubatech/api/network/LoadConfigPacket.java | 3 + .../java/kubatech/commands/CommandHandler.java | 2 +- src/main/java/kubatech/commands/CommandTea.java | 109 +++++++ src/main/java/kubatech/kubatech.java | 8 +- src/main/java/kubatech/loaders/BlockLoader.java | 24 ++ src/main/java/kubatech/loaders/ItemLoader.java | 6 +- src/main/java/kubatech/loaders/RecipeLoader.java | 20 ++ src/main/java/kubatech/loaders/TCLoader.java | 125 ++++++++ .../java/kubatech/loaders/block/BlockProxy.java | 76 +++++ .../loaders/block/IProxyTileEntityProvider.java | 8 + .../java/kubatech/loaders/block/KubaBlock.java | 187 ++++++++++++ .../java/kubatech/loaders/block/KubaItemBlock.java | 37 +++ .../kubatech/loaders/block/blocks/TeaAcceptor.java | 42 +++ .../java/kubatech/loaders/item/IItemProxyGUI.java | 9 + src/main/java/kubatech/loaders/item/ItemProxy.java | 31 ++ src/main/java/kubatech/loaders/item/KubaItems.java | 6 + .../kubatech/loaders/item/items/TeaCollection.java | 42 +-- .../kubatech/loaders/item/items/TeaUltimate.java | 160 +++++++++- src/main/java/kubatech/mixin/Mixin.java | 3 +- .../mixin/mixins/minecraft/WorldMixin.java | 21 ++ src/main/java/kubatech/savedata/PlayerData.java | 26 ++ .../java/kubatech/savedata/PlayerDataManager.java | 71 +++++ .../java/kubatech/tileentity/TeaAcceptorTile.java | 183 ++++++++++++ ...MetaTileEntity_ExtremeExterminationChamber.java | 199 +++++++++++++ .../GT_MetaTileEntity_MegaIndustrialApiary.java | 331 ++++++++++++++++++++- 30 files changed, 1744 insertions(+), 50 deletions(-) create mode 100644 src/main/java/kubatech/commands/CommandTea.java create mode 100644 src/main/java/kubatech/loaders/BlockLoader.java create mode 100644 src/main/java/kubatech/loaders/TCLoader.java create mode 100644 src/main/java/kubatech/loaders/block/BlockProxy.java create mode 100644 src/main/java/kubatech/loaders/block/IProxyTileEntityProvider.java create mode 100644 src/main/java/kubatech/loaders/block/KubaBlock.java create mode 100644 src/main/java/kubatech/loaders/block/KubaItemBlock.java create mode 100644 src/main/java/kubatech/loaders/block/blocks/TeaAcceptor.java create mode 100644 src/main/java/kubatech/loaders/item/IItemProxyGUI.java create mode 100644 src/main/java/kubatech/mixin/mixins/minecraft/WorldMixin.java create mode 100644 src/main/java/kubatech/savedata/PlayerData.java create mode 100644 src/main/java/kubatech/savedata/PlayerDataManager.java create mode 100644 src/main/java/kubatech/tileentity/TeaAcceptorTile.java (limited to 'src/main/java') diff --git a/src/main/java/kubatech/CommonProxy.java b/src/main/java/kubatech/CommonProxy.java index ccd4949137..f34ce3216a 100644 --- a/src/main/java/kubatech/CommonProxy.java +++ b/src/main/java/kubatech/CommonProxy.java @@ -19,15 +19,21 @@ package kubatech; -import static kubatech.loaders.ItemLoader.RegisterItems; +import static kubatech.loaders.BlockLoader.registerBlocks; +import static kubatech.loaders.ItemLoader.registerItems; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.event.*; +import kubatech.api.LoaderReference; import kubatech.commands.CommandConfig; import kubatech.commands.CommandHandler; import kubatech.commands.CommandHelp; +import kubatech.commands.CommandTea; import kubatech.config.Config; import kubatech.loaders.RecipeLoader; +import kubatech.loaders.TCLoader; +import kubatech.savedata.PlayerDataManager; +import net.minecraftforge.common.MinecraftForge; public class CommonProxy { @@ -37,22 +43,28 @@ public class CommonProxy { Config.init(event.getModConfigurationDirectory()); Config.synchronizeConfiguration(); FMLCommonHandler.instance().bus().register(new FMLEventHandler()); - RegisterItems(); - RecipeLoader.addRecipes(); + MinecraftForge.EVENT_BUS.register(new PlayerDataManager()); + registerItems(); + registerBlocks(); + if (LoaderReference.Thaumcraft) TCLoader.load(); } public void init(FMLInitializationEvent event) {} - public void postInit(FMLPostInitializationEvent event) {} + public void postInit(FMLPostInitializationEvent event) { + RecipeLoader.addRecipes(); + } public void serverAboutToStart(FMLServerAboutToStartEvent event) {} public void serverStarting(FMLServerStartingEvent event) { RecipeLoader.addRecipesLate(); + if (LoaderReference.Thaumcraft) TCLoader.lateLoad(); CommandHandler cmd = new CommandHandler(); cmd.addCommand(new CommandHelp()); cmd.addCommand(new CommandConfig()); // cmd.addCommand(new CommandBees()); + cmd.addCommand(new CommandTea()); event.registerServerCommand(cmd); } diff --git a/src/main/java/kubatech/api/LoaderReference.java b/src/main/java/kubatech/api/LoaderReference.java index b9e76a9a30..3215fa1b21 100644 --- a/src/main/java/kubatech/api/LoaderReference.java +++ b/src/main/java/kubatech/api/LoaderReference.java @@ -15,4 +15,6 @@ public class LoaderReference { public static final boolean HarvestCraft = Loader.isModLoaded("harvestcraft"); public static final boolean TwilightForest = Loader.isModLoaded("TwilightForest"); public static final boolean Forestry = Loader.isModLoaded("Forestry"); + public static final boolean DraconicEvolution = Loader.isModLoaded("DraconicEvolution"); + public static final boolean Avaritia = Loader.isModLoaded("Avaritia"); } diff --git a/src/main/java/kubatech/api/enums/ItemList.java b/src/main/java/kubatech/api/enums/ItemList.java index b37bd86c1c..00334d848e 100644 --- a/src/main/java/kubatech/api/enums/ItemList.java +++ b/src/main/java/kubatech/api/enums/ItemList.java @@ -52,7 +52,8 @@ public enum ItemList implements IItemContainer { FermentedTeaLeaf, BruisedTeaLeaf, PartiallyOxidizedTeaLeaf, - ; + TeaAcceptorResearchNote, + TeaAcceptor; private ItemStack mStack; private boolean mHasNotBeenSet = true; diff --git a/src/main/java/kubatech/api/helpers/ReflectionHelper.java b/src/main/java/kubatech/api/helpers/ReflectionHelper.java index 1d7449afc4..7b02fe6c82 100644 --- a/src/main/java/kubatech/api/helpers/ReflectionHelper.java +++ b/src/main/java/kubatech/api/helpers/ReflectionHelper.java @@ -45,6 +45,7 @@ public class ReflectionHelper { boolean exceptionDetected = false; Field f = null; do { + exceptionDetected = false; try { f = cl.getDeclaredField(fieldName); f.setAccessible(true); @@ -61,6 +62,38 @@ public class ReflectionHelper { } } + public static boolean setField(Object obj, String fieldName, T value) { + Class cl = obj.getClass(); + String clName = cl.getName(); + HashMap classmap = classes.computeIfAbsent(clName, s -> new _FieldsMethods()).fields; + try { + if (classmap.containsKey(fieldName)) { + Field f = classmap.get(fieldName); + if (f == null) return false; + f.set(obj, value); + return true; + } + boolean exceptionDetected = false; + Field f = null; + do { + exceptionDetected = false; + try { + f = cl.getDeclaredField(fieldName); + f.setAccessible(true); + } catch (Exception ex) { + exceptionDetected = true; + cl = cl.getSuperclass(); + } + } while (exceptionDetected && !cl.equals(Object.class)); + classmap.put(fieldName, f); + if (f == null) return false; + f.set(obj, value); + return true; + } catch (Exception ex) { + return false; + } + } + public static T getField(Object obj, String fieldName) { return getField(obj, fieldName, null); } @@ -87,6 +120,7 @@ public class ReflectionHelper { boolean exceptionDetected = false; Method m = null; do { + exceptionDetected = false; try { m = cl.getDeclaredMethod(methodName, argsTypes); m.setAccessible(true); diff --git a/src/main/java/kubatech/api/network/CustomTileEntityPacket.java b/src/main/java/kubatech/api/network/CustomTileEntityPacket.java index b81bbb0337..11fb4f848f 100644 --- a/src/main/java/kubatech/api/network/CustomTileEntityPacket.java +++ b/src/main/java/kubatech/api/network/CustomTileEntityPacket.java @@ -128,7 +128,11 @@ public class CustomTileEntityPacket implements IMessage { @Override public IMessage onMessage(CustomTileEntityPacket message, MessageContext ctx) { if (!ModUtils.isClientSided) return null; - World w = Minecraft.getMinecraft().thePlayer.getEntityWorld(); + Minecraft mc = Minecraft.getMinecraft(); + if (mc == null) return null; + if (mc.thePlayer == null) return null; + World w = mc.thePlayer.getEntityWorld(); + if (w == null) return null; if (message.w != w.provider.dimensionId) return null; TileEntity e = w.getTileEntity(message.x, message.y, message.z); if (e == null || e.isInvalid()) return null; diff --git a/src/main/java/kubatech/api/network/LoadConfigPacket.java b/src/main/java/kubatech/api/network/LoadConfigPacket.java index defb139151..03602e89f1 100644 --- a/src/main/java/kubatech/api/network/LoadConfigPacket.java +++ b/src/main/java/kubatech/api/network/LoadConfigPacket.java @@ -26,10 +26,12 @@ import io.netty.buffer.ByteBuf; import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.HashSet; +import kubatech.api.LoaderReference; import kubatech.config.Config; import kubatech.config.OverridesConfig; import kubatech.kubatech; import kubatech.loaders.MobRecipeLoader; +import kubatech.loaders.TCLoader; public class LoadConfigPacket implements IMessage { @@ -85,6 +87,7 @@ public class LoadConfigPacket implements IMessage { public IMessage onMessage(LoadConfigPacket message, MessageContext ctx) { kubatech.info("Received Mob Handler config, parsing"); MobRecipeLoader.processMobRecipeMap(message.mobsToLoad, message.mobsOverrides); + if (LoaderReference.Thaumcraft) TCLoader.lateLoad(); return null; } } diff --git a/src/main/java/kubatech/commands/CommandHandler.java b/src/main/java/kubatech/commands/CommandHandler.java index d1822a1ff8..dfa612fcce 100644 --- a/src/main/java/kubatech/commands/CommandHandler.java +++ b/src/main/java/kubatech/commands/CommandHandler.java @@ -61,7 +61,7 @@ public class CommandHandler extends CommandBase { } } - private static final ArrayList aliases = new ArrayList<>(Collections.singleton("kt")); + private static final List aliases = Collections.singletonList("kt"); public static final HashMap commands = new HashMap<>(); @Override diff --git a/src/main/java/kubatech/commands/CommandTea.java b/src/main/java/kubatech/commands/CommandTea.java new file mode 100644 index 0000000000..187b21c789 --- /dev/null +++ b/src/main/java/kubatech/commands/CommandTea.java @@ -0,0 +1,109 @@ +package kubatech.commands; + +import static kubatech.commands.CommandTea.Translations.*; + +import kubatech.savedata.PlayerData; +import kubatech.savedata.PlayerDataManager; +import net.minecraft.command.CommandBase; +import net.minecraft.command.ICommandSender; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.StatCollector; + +public class CommandTea extends CommandBase { + enum Translations { + INVALID_OPTION, + PLAYER_NOT_FOUND, + SUCCESS_GET, + SUCCESS_SET, + SUCCESS_ADD, + USAGE, + ; + final String key; + + Translations() { + key = "command.tea." + this.name().toLowerCase(); + } + + public String get() { + return StatCollector.translateToLocal(key); + } + + public String get(Object... args) { + return StatCollector.translateToLocalFormatted(key, args); + } + + public String getKey() { + return key; + } + + @Override + public String toString() { + return get(); + } + } + + @Override + public String getCommandName() { + return "tea"; + } + + @Override + public String getCommandUsage(ICommandSender p_71518_1_) { + return "tea " + USAGE.get(); + } + + @Override + public int getRequiredPermissionLevel() { + return 4; + } + + @Override + public void processCommand(ICommandSender p_71515_1_, String[] p_71515_2_) { + if (p_71515_2_.length < 2) { + p_71515_1_.addChatMessage(new ChatComponentText(INVALID_OPTION.get())); + return; + } + PlayerData playerData = PlayerDataManager.getPlayer(p_71515_2_[0]); + if (playerData == null) { + p_71515_1_.addChatMessage(new ChatComponentText(PLAYER_NOT_FOUND.get())); + return; + } + if (!p_71515_2_[1].equalsIgnoreCase("get") && p_71515_2_.length < 3) { + p_71515_1_.addChatMessage(new ChatComponentText(INVALID_OPTION.get())); + return; + } + switch (p_71515_2_[1].toLowerCase()) { + case "get": + p_71515_1_.addChatMessage(new ChatComponentText(SUCCESS_GET.get(p_71515_2_[0], playerData.teaAmount))); + break; + case "set": { + long tea; + try { + tea = Long.parseLong(p_71515_2_[2]); + } catch (NumberFormatException ex) { + p_71515_1_.addChatMessage(new ChatComponentText(INVALID_OPTION.get())); + return; + } + playerData.teaAmount = tea; + playerData.markDirty(); + p_71515_1_.addChatMessage(new ChatComponentText(SUCCESS_SET.get(p_71515_2_[0], playerData.teaAmount))); + break; + } + case "add": { + long tea; + try { + tea = Long.parseLong(p_71515_2_[2]); + } catch (NumberFormatException ex) { + p_71515_1_.addChatMessage(new ChatComponentText(INVALID_OPTION.get())); + return; + } + playerData.teaAmount += tea; + playerData.markDirty(); + p_71515_1_.addChatMessage(new ChatComponentText(SUCCESS_ADD.get(p_71515_2_[0], playerData.teaAmount))); + break; + } + default: + break; + } + } +} diff --git a/src/main/java/kubatech/kubatech.java b/src/main/java/kubatech/kubatech.java index ca4d06320f..740699aa34 100644 --- a/src/main/java/kubatech/kubatech.java +++ b/src/main/java/kubatech/kubatech.java @@ -42,9 +42,11 @@ import org.apache.logging.log4j.Logger; version = Tags.VERSION, name = Tags.MODNAME, acceptedMinecraftVersions = "[1.7.10]", - dependencies = "required-after:gregtech; " + "required-after:gtnhmixins@[2.0.1,); " + "after:EnderIO; " - + "after:AWWayofTime; " + "after:ExtraUtilities; " + "after: InfernalMobs; " + "after: Thaumcraft; " - + "after: MineTweaker3; " + "after: miscutils; " + "after: harvestcraft; " + "after: Forestry; ") + dependencies = "required-after: gregtech; " + "required-after: gtnhmixins@[2.0.1,); " + + "required-after: modularui; " + "after: EnderIO; " + + "after: AWWayofTime; " + "after: ExtraUtilities; " + "after: InfernalMobs; " + "after: Thaumcraft; " + + "after: MineTweaker3; " + "after: miscutils; " + "after: harvestcraft; " + "after: Forestry; " + + "after: DraconicEvolution; " + "after: Avaritia; " + " after: dreamcraft; ") public class kubatech { public static kubatech instance = null; diff --git a/src/main/java/kubatech/loaders/BlockLoader.java b/src/main/java/kubatech/loaders/BlockLoader.java new file mode 100644 index 0000000000..55e97badc6 --- /dev/null +++ b/src/main/java/kubatech/loaders/BlockLoader.java @@ -0,0 +1,24 @@ +package kubatech.loaders; + +import cpw.mods.fml.common.registry.GameRegistry; +import kubatech.api.enums.ItemList; +import kubatech.loaders.block.KubaBlock; +import kubatech.loaders.block.KubaItemBlock; +import kubatech.loaders.block.blocks.TeaAcceptor; +import kubatech.tileentity.TeaAcceptorTile; +import net.minecraft.block.material.Material; +import net.minecraft.item.ItemBlock; + +public class BlockLoader { + + public static final KubaBlock kubaBlock = new KubaBlock(Material.anvil); + public static final ItemBlock kubaItemBlock = new KubaItemBlock(kubaBlock); + + public static void registerBlocks() { + GameRegistry.registerTileEntity(TeaAcceptorTile.class, "KT_TeaAcceptor"); + GameRegistry.registerBlock(kubaBlock, null, "kubablocks"); + GameRegistry.registerItem(kubaItemBlock, "kubablocks"); + + ItemList.TeaAcceptor.set(kubaBlock.registerProxyBlock(new TeaAcceptor())); + } +} diff --git a/src/main/java/kubatech/loaders/ItemLoader.java b/src/main/java/kubatech/loaders/ItemLoader.java index 7df248da60..8db9c9f15f 100644 --- a/src/main/java/kubatech/loaders/ItemLoader.java +++ b/src/main/java/kubatech/loaders/ItemLoader.java @@ -22,6 +22,7 @@ package kubatech.loaders; import static kubatech.api.enums.ItemList.*; import cpw.mods.fml.common.registry.GameRegistry; +import kubatech.loaders.item.ItemProxy; import kubatech.loaders.item.KubaItems; import kubatech.loaders.item.items.Tea; import kubatech.loaders.item.items.TeaCollection; @@ -31,7 +32,7 @@ import kubatech.loaders.item.items.TeaUltimate; public class ItemLoader { public static final KubaItems kubaitems = new KubaItems(); - public static void RegisterItems() { + public static void registerItems() { GameRegistry.registerItem(kubaitems, "kubaitems"); // DON'T EVER CHANGE ORDER IN HERE, ADD NEW ITEMS ON BOTTOM @@ -75,5 +76,8 @@ public class ItemLoader { FermentedTeaLeaf.set(kubaitems.registerProxyItem(new TeaIngredient("fermented_tea_leaf"))); BruisedTeaLeaf.set(kubaitems.registerProxyItem(new TeaIngredient("bruised_tea_leaf"))); PartiallyOxidizedTeaLeaf.set(kubaitems.registerProxyItem(new TeaIngredient("partially_oxidized_tea_leaf"))); + + TeaAcceptorResearchNote.set( + kubaitems.registerProxyItem(new ItemProxy("tea_acceptor_research_note", "research_note"))); } } diff --git a/src/main/java/kubatech/loaders/RecipeLoader.java b/src/main/java/kubatech/loaders/RecipeLoader.java index 2b7fe77719..7bbaaf17e7 100644 --- a/src/main/java/kubatech/loaders/RecipeLoader.java +++ b/src/main/java/kubatech/loaders/RecipeLoader.java @@ -21,6 +21,7 @@ package kubatech.loaders; import static kubatech.api.enums.ItemList.*; +import com.dreammaster.gthandler.CustomItemList; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; @@ -270,5 +271,24 @@ public class RecipeLoader { GameRegistry.addSmelting(WhiteTeaLeaf.get(1), WhiteTea.get(1), 10); GameRegistry.addSmelting(YellowTeaLeaf.get(1), YellowTea.get(1), 10); } + if (LoaderReference.Avaritia && LoaderReference.GTNHCoreMod) { + GT_Values.RA.addAssemblylineRecipe( + TeaAcceptorResearchNote.get(1), + 10000, + new Object[] { + LegendaryUltimateTea.get(0), + GameRegistry.findItemStack("Avaritia", "Neutronium_Compressor", 1), + gregtech.api.enums.ItemList.Quantum_Tank_EV.get(1), + CustomItemList.FluidExtractorUHV.get(10), + new Object[] {OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L}, + new Object[] {OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L}, + new Object[] {OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L}, + new Object[] {OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L}, + }, + new FluidStack[] {FluidRegistry.getFluidStack("molten.indalloy140", 28800)}, + TeaAcceptor.get(1), + 6000, + 2_048_000); + } } } diff --git a/src/main/java/kubatech/loaders/TCLoader.java b/src/main/java/kubatech/loaders/TCLoader.java new file mode 100644 index 0000000000..3c4980f251 --- /dev/null +++ b/src/main/java/kubatech/loaders/TCLoader.java @@ -0,0 +1,125 @@ +package kubatech.loaders; + +import cpw.mods.fml.common.registry.GameRegistry; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.stream.Collectors; +import kubatech.api.LoaderReference; +import kubatech.api.enums.ItemList; +import kubatech.api.utils.ItemID; +import kubatech.loaders.item.items.TeaUltimate; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import thaumcraft.api.ThaumcraftApi; +import thaumcraft.api.ThaumcraftApiHelper; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.crafting.InfusionRecipe; +import thaumcraft.api.research.ResearchCategories; +import thaumcraft.api.research.ResearchItem; +import thaumcraft.api.research.ResearchPage; + +public class TCLoader { + private static boolean lateLoaded = false; + + public static void load() {} + + public static void lateLoad() { + if (lateLoaded) return; + lateLoaded = true; + if (!LoaderReference.GTNHCoreMod || !LoaderReference.DraconicEvolution) return; + + final ItemStack[] components = new ItemStack[] { + // ItemList.LegendaryBlackTea.get(1), + // ItemList.LegendaryButterflyTea.get(1), + // ItemList.LegendaryEarlGrayTea.get(1), + ItemList.LegendaryGreenTea.get(1), // EIG + // ItemList.LegendaryLemonTea.get(1), + // ItemList.LegendaryMilkTea.get(1), + // ItemList.LegendaryOolongTea.get(1), + ItemList.LegendaryPeppermintTea.get(1), // HTGR + ItemList.LegendaryPuerhTea.get(1), // EEC + // ItemList.LegendaryRedTea.get(1), + // ItemList.LegendaryWhiteTea.get(1), + ItemList.LegendaryYellowTea.get(1), // IApiary + ItemList.BlackTea.get(1), + ItemList.EarlGrayTea.get(1), + ItemList.GreenTea.get(1), + ItemList.LemonTea.get(1), + ItemList.MilkTea.get(1), + ItemList.OolongTea.get(1), + ItemList.PeppermintTea.get(1), + ItemList.PuerhTea.get(1), + ItemList.WhiteTea.get(1), + ItemList.YellowTea.get(1) + }; + + final HashSet componentsHashed = Arrays.stream(components) + .map(stack -> ItemID.create_NoCopy(stack, true, false, true)) + .collect(Collectors.toCollection(HashSet::new)); + + InfusionRecipe ultimateTeaRecipe; + //noinspection unchecked + ThaumcraftApi.getCraftingRecipes() + .add( + ultimateTeaRecipe = + new InfusionRecipe( + "KT_UltimateTea", + ItemList.LegendaryUltimateTea.get(1), + 10, + new AspectList() + .add(Aspect.MAGIC, 100) + .add(Aspect.HEAL, 100) + .add(Aspect.PLANT, 100) + .add(Aspect.EXCHANGE, 100), + GameRegistry.findItemStack("DraconicEvolution", "dezilsMarshmallow", 1), + components) { + @Override + public boolean matches( + ArrayList input, + ItemStack central, + World world, + EntityPlayer player) { + if (!central.isItemEqual(getRecipeInput())) return false; + if (!ThaumcraftApiHelper.isResearchComplete( + player.getCommandSenderName(), this.research)) return false; + if (componentsHashed.size() > input.size()) return false; + HashSet hashedInputs = input.stream() + .map(stack -> ItemID.create_NoCopy(stack, true, false, true)) + .collect(Collectors.toCollection(HashSet::new)); + return hashedInputs.containsAll(componentsHashed); + } + }); + ResearchItem research = + new ResearchItem( + "KT_UltimateTea", + "NEWHORIZONS", + new AspectList() + .add(Aspect.MAGIC, 1) + .add(Aspect.HEAL, 1) + .add(Aspect.PLANT, 1) + .add(Aspect.EXCHANGE, 1), + -2, + 4, + 2, + ItemList.LegendaryUltimateTea.get(1)) { + @Override + public String getName() { + return TeaUltimate.getUltimateTeaDisplayName(super.getName()); + } + }; + research.setPages( + new ResearchPage("KT.research.ultimatetea") { + @Override + public String getTranslatedText() { + return TeaUltimate.getUltimateTeaDisplayName(super.getTranslatedText()); + } + }, + new ResearchPage(ultimateTeaRecipe)); + research.setParents("INFUSION", "DEZILSMARSHMALLOW"); + ThaumcraftApi.addWarpToResearch("KT_UltimateTea", 20); + ResearchCategories.addResearch(research); + } +} diff --git a/src/main/java/kubatech/loaders/block/BlockProxy.java b/src/main/java/kubatech/loaders/block/BlockProxy.java new file mode 100644 index 0000000000..1c06fd50d9 --- /dev/null +++ b/src/main/java/kubatech/loaders/block/BlockProxy.java @@ -0,0 +1,76 @@ +package kubatech.loaders.block; + +import static kubatech.loaders.block.KubaBlock.defaultTileEntityUI; + +import com.gtnewhorizons.modularui.api.screen.ITileWithModularUI; +import java.util.List; +import kubatech.Tags; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.util.StatCollector; +import net.minecraft.world.World; + +public class BlockProxy { + + private final String unlocalizedName; + private final String texturepath; + private IIcon icon; + + public BlockProxy(String unlocalizedName, String texture) { + this.unlocalizedName = "kubablock." + unlocalizedName; + texturepath = Tags.MODID + ":" + texture; + } + + public void itemInit(int ID) {} + + public boolean onActivated(World world, int x, int y, int z, EntityPlayer player) { + if (this instanceof IProxyTileEntityProvider) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof ITileWithModularUI) { + if (world.isRemote) return true; + if (te instanceof KubaBlock.IModularUIProvider) + ((KubaBlock.IModularUIProvider) te).getUI().open(player, world, x, y, z); + else defaultTileEntityUI.open(player, world, x, y, z); + return true; + } + } + return false; + } + + public void onBlockPlaced(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) {} + + public void registerIcon(IIconRegister iconRegister) { + icon = iconRegister.registerIcon(texturepath); + } + + public IIcon getIcon(int side) { + return icon; + } + + public String getUnlocalizedName() { + return this.unlocalizedName; + } + + public String getDisplayName(ItemStack stack) { + return StatCollector.translateToLocal(this.unlocalizedName + ".name").trim(); + } + + public void addInformation(ItemStack stack, EntityPlayer entity, List tooltipList, boolean showDebugInfo) {} + + public float getHardness() { + return 10.f; + } + + public Material getMaterial() { + return Material.anvil; + } + + public float getResistance() { + return 5.f; + } +} diff --git a/src/main/java/kubatech/loaders/block/IProxyTileEntityProvider.java b/src/main/java/kubatech/loaders/block/IProxyTileEntityProvider.java new file mode 100644 index 0000000000..b2a94c09b7 --- /dev/null +++ b/src/main/java/kubatech/loaders/block/IProxyTileEntityProvider.java @@ -0,0 +1,8 @@ +package kubatech.loaders.block; + +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +public interface IProxyTileEntityProvider { + TileEntity createTileEntity(World world); +} diff --git a/src/main/java/kubatech/loaders/block/KubaBlock.java b/src/main/java/kubatech/loaders/block/KubaBlock.java new file mode 100644 index 0000000000..dd34ce5883 --- /dev/null +++ b/src/main/java/kubatech/loaders/block/KubaBlock.java @@ -0,0 +1,187 @@ +package kubatech.loaders.block; + +import static kubatech.kubatech.KT; + +import com.gtnewhorizons.modularui.api.screen.ITileWithModularUI; +import com.gtnewhorizons.modularui.api.screen.ModularUIContext; +import com.gtnewhorizons.modularui.api.screen.ModularWindow; +import com.gtnewhorizons.modularui.api.screen.UIBuildContext; +import com.gtnewhorizons.modularui.common.builder.UIBuilder; +import com.gtnewhorizons.modularui.common.builder.UIInfo; +import com.gtnewhorizons.modularui.common.internal.wrapper.ModularGui; +import com.gtnewhorizons.modularui.common.internal.wrapper.ModularUIContainer; +import java.lang.ref.WeakReference; +import java.util.HashMap; +import java.util.List; +import java.util.function.Function; +import kubatech.loaders.BlockLoader; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; + +public class KubaBlock extends Block { + + public static final Function> TileEntityUIFactory = + containerConstructor -> UIBuilder.of() + .container((player, world, x, y, z) -> { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof ITileWithModularUI) { + UIBuildContext buildContext = new UIBuildContext(player); + ModularWindow window = ((ITileWithModularUI) te).createWindow(buildContext); + return containerConstructor.createUIContainer( + new ModularUIContext(buildContext, te::markDirty), window); + } + return null; + }) + .gui(((player, world, x, y, z) -> { + if (!world.isRemote) return null; + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof ITileWithModularUI) { + UIBuildContext buildContext = new UIBuildContext(player); + ModularWindow window = ((ITileWithModularUI) te).createWindow(buildContext); + return new ModularGui(containerConstructor.createUIContainer( + new ModularUIContext(buildContext, null), window)); + } + return null; + })) + .build(); + + public static final UIInfo defaultTileEntityUI = TileEntityUIFactory.apply(ModularUIContainer::new); + + static final HashMap blocks = new HashMap<>(); + private static int idCounter = 0; + + public KubaBlock(Material p_i45394_1_) { + super(p_i45394_1_); + setCreativeTab(KT); + } + + public ItemStack registerProxyBlock(BlockProxy block) { + blocks.put(idCounter, block); + block.itemInit(idCounter); + return new ItemStack(BlockLoader.kubaItemBlock, 1, idCounter++); + } + + private BlockProxy getBlock(int id) { + return blocks.get(id); + } + + WeakReference lastAccessor = null; + int X, Y, Z; + + public void setLastBlockAccess(World accessor, int x, int y, int z) { + lastAccessor = new WeakReference<>(accessor); + X = x; + Y = y; + Z = z; + } + + @Override + public boolean hasTileEntity(int meta) { + return getBlock(meta) instanceof IProxyTileEntityProvider; + } + + @SuppressWarnings("unchecked") + @Override + public void getSubBlocks(Item p_149666_1_, CreativeTabs p_149666_2_, List p_149666_3_) { + for (int i = 0; i < blocks.size(); i++) p_149666_3_.add(new ItemStack(p_149666_1_, 1, i)); + } + + @Override + public void registerBlockIcons(IIconRegister p_149651_1_) { + blocks.values().forEach(b -> b.registerIcon(p_149651_1_)); + } + + @Override + public IIcon getIcon(int p_149691_1_, int p_149691_2_) { + return blocks.get(p_149691_2_).getIcon(p_149691_1_); + } + + @Override + public String getLocalizedName() { + return "KUBABLOCK"; + } + + @Override + public TileEntity createTileEntity(World world, int metadata) { + if (!hasTileEntity(metadata)) return null; + return ((IProxyTileEntityProvider) getBlock(metadata)).createTileEntity(world); + } + + @Override + public boolean onBlockActivated( + World p_149727_1_, + int p_149727_2_, + int p_149727_3_, + int p_149727_4_, + EntityPlayer p_149727_5_, + int p_149727_6_, + float p_149727_7_, + float p_149727_8_, + float p_149727_9_) { + return getBlock(p_149727_1_.getBlockMetadata(p_149727_2_, p_149727_3_, p_149727_4_)) + .onActivated(p_149727_1_, p_149727_2_, p_149727_3_, p_149727_4_, p_149727_5_); + } + + @Override + public void onBlockPlacedBy( + World p_149689_1_, + int p_149689_2_, + int p_149689_3_, + int p_149689_4_, + EntityLivingBase p_149689_5_, + ItemStack p_149689_6_) { + getBlock(p_149689_6_.getItemDamage()) + .onBlockPlaced(p_149689_1_, p_149689_2_, p_149689_3_, p_149689_4_, p_149689_5_, p_149689_6_); + } + + @Override + public float getBlockHardness(World p_149712_1_, int p_149712_2_, int p_149712_3_, int p_149712_4_) { + return getBlock(p_149712_1_.getBlockMetadata(p_149712_2_, p_149712_3_, p_149712_4_)) + .getHardness(); + } + + @Override + public Material getMaterial() { + if (lastAccessor == null) return super.getMaterial(); + World world = lastAccessor.get(); + if (world == null) { + lastAccessor = null; + return super.getMaterial(); + } + if (world.getBlock(X, Y, Z) != this) return super.getMaterial(); + return getBlock(world.getBlockMetadata(X, Y, Z)).getMaterial(); + } + + @Override + public float getExplosionResistance( + Entity par1Entity, + World world, + int x, + int y, + int z, + double explosionX, + double explosionY, + double explosionZ) { + return getBlock(world.getBlockMetadata(x, y, z)).getResistance(); + } + + @FunctionalInterface + public interface IModularUIContainerCreator { + ModularUIContainer createUIContainer(ModularUIContext context, ModularWindow mainWindow); + } + + @FunctionalInterface + public interface IModularUIProvider { + UIInfo getUI(); + } +} diff --git a/src/main/java/kubatech/loaders/block/KubaItemBlock.java b/src/main/java/kubatech/loaders/block/KubaItemBlock.java new file mode 100644 index 0000000000..eb5197d1bf --- /dev/null +++ b/src/main/java/kubatech/loaders/block/KubaItemBlock.java @@ -0,0 +1,37 @@ +package kubatech.loaders.block; + +import java.util.List; +import kubatech.kubatech; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; + +public class KubaItemBlock extends ItemBlock { + public KubaItemBlock(Block p_i45328_1_) { + super(p_i45328_1_); + setHasSubtypes(true); + } + + @Override + public void registerIcons(IIconRegister p_94581_1_) { + super.registerIcons(p_94581_1_); + } + + @Override + public String getUnlocalizedName(ItemStack p_77667_1_) { + return KubaBlock.blocks.get(p_77667_1_.getItemDamage()).getUnlocalizedName(); + } + + @Override + public String getItemStackDisplayName(ItemStack p_77653_1_) { + return KubaBlock.blocks.get(p_77653_1_.getItemDamage()).getDisplayName(p_77653_1_); + } + + @SuppressWarnings("unchecked") + @Override + public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List p_77624_3_, boolean p_77624_4_) { + KubaBlock.blocks.get(p_77624_1_.getItemDamage()).addInformation(p_77624_1_, p_77624_2_, p_77624_3_, p_77624_4_); + } +} diff --git a/src/main/java/kubatech/loaders/block/blocks/TeaAcceptor.java b/src/main/java/kubatech/loaders/block/blocks/TeaAcceptor.java new file mode 100644 index 0000000000..97b41efdc0 --- /dev/null +++ b/src/main/java/kubatech/loaders/block/blocks/TeaAcceptor.java @@ -0,0 +1,42 @@ +package kubatech.loaders.block.blocks; + +import java.util.List; +import kubatech.loaders.block.BlockProxy; +import kubatech.loaders.block.IProxyTileEntityProvider; +import kubatech.tileentity.TeaAcceptorTile; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +public class TeaAcceptor extends BlockProxy implements IProxyTileEntityProvider { + + public TeaAcceptor() { + super("tea_acceptor", "tea_acceptor"); + } + + @Override + public TileEntity createTileEntity(World world) { + return new TeaAcceptorTile(); + } + + @Override + public void onBlockPlaced(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { + if (world.isRemote) return; + if (!(player instanceof EntityPlayerMP)) return; + ((TeaAcceptorTile) world.getTileEntity(x, y, z)).setTeaOwner(player.getCommandSenderName()); + } + + @Override + public void addInformation(ItemStack stack, EntityPlayer entity, List tooltipList, boolean showDebugInfo) { + tooltipList.add("Accepts Tea items and adds them to your network"); + tooltipList.add("Can accept up to 10 stacks per tick"); + } + + @Override + public float getResistance() { + return 999999999999.f; + } +} diff --git a/src/main/java/kubatech/loaders/item/IItemProxyGUI.java b/src/main/java/kubatech/loaders/item/IItemProxyGUI.java new file mode 100644 index 0000000000..40020c81e9 --- /dev/null +++ b/src/main/java/kubatech/loaders/item/IItemProxyGUI.java @@ -0,0 +1,9 @@ +package kubatech.loaders.item; + +import com.gtnewhorizons.modularui.api.screen.ModularWindow; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + +public interface IItemProxyGUI { + ModularWindow createWindow(ItemStack stack, EntityPlayer player); +} diff --git a/src/main/java/kubatech/loaders/item/ItemProxy.java b/src/main/java/kubatech/loaders/item/ItemProxy.java index 03ea390f74..6c2ac6f7ea 100644 --- a/src/main/java/kubatech/loaders/item/ItemProxy.java +++ b/src/main/java/kubatech/loaders/item/ItemProxy.java @@ -19,6 +19,13 @@ package kubatech.loaders.item; +import com.gtnewhorizons.modularui.api.screen.ModularUIContext; +import com.gtnewhorizons.modularui.api.screen.ModularWindow; +import com.gtnewhorizons.modularui.api.screen.UIBuildContext; +import com.gtnewhorizons.modularui.common.builder.UIBuilder; +import com.gtnewhorizons.modularui.common.builder.UIInfo; +import com.gtnewhorizons.modularui.common.internal.wrapper.ModularGui; +import com.gtnewhorizons.modularui.common.internal.wrapper.ModularUIContainer; import java.util.List; import kubatech.Tags; import net.minecraft.client.renderer.texture.IIconRegister; @@ -31,6 +38,25 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; public class ItemProxy { + private static final UIInfo HeldItemUIInfo = UIBuilder.of() + .container((player, w, x, y, z) -> { + ItemStack stack = player.getHeldItem(); + ItemProxy proxy = KubaItems.getItemProxy(stack); + if (!(proxy instanceof IItemProxyGUI)) return null; + UIBuildContext context = new UIBuildContext(player); + ModularWindow window = ((IItemProxyGUI) proxy).createWindow(stack, player); + return new ModularUIContainer( + new ModularUIContext(context, () -> player.inventoryContainer.detectAndSendChanges()), window); + }) + .gui((player, w, x, y, z) -> { + ItemStack stack = player.getHeldItem(); + ItemProxy proxy = KubaItems.getItemProxy(stack); + if (!(proxy instanceof IItemProxyGUI)) return null; + UIBuildContext context = new UIBuildContext(player); + ModularWindow window = ((IItemProxyGUI) proxy).createWindow(stack, player); + return new ModularGui(new ModularUIContainer(new ModularUIContext(context, null), window)); + }) + .build(); private final String unlocalizedName; private final String texturepath; private IIcon icon; @@ -80,4 +106,9 @@ public class ItemProxy { public int getMaxItemUseDuration() { return 0; } + + public static void openHeldItemGUI(EntityPlayer player) { + ItemStack stack = player.getHeldItem(); + if (KubaItems.getItemProxy(stack) instanceof IItemProxyGUI) HeldItemUIInfo.open(player); + } } diff --git a/src/main/java/kubatech/loaders/item/KubaItems.java b/src/main/java/kubatech/loaders/item/KubaItems.java index b0f8723cde..205622a30b 100644 --- a/src/main/java/kubatech/loaders/item/KubaItems.java +++ b/src/main/java/kubatech/loaders/item/KubaItems.java @@ -25,6 +25,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import java.util.HashMap; import java.util.List; +import kubatech.loaders.ItemLoader; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; @@ -56,6 +57,11 @@ public class KubaItems extends Item { return items.get(stack.getItemDamage()); } + public static ItemProxy getItemProxy(ItemStack stack) { + if (!(stack.getItem() instanceof KubaItems)) return null; + return ItemLoader.kubaitems.getItem(stack); + } + private ItemProxy getItem(int damage) { return items.get(damage); } diff --git a/src/main/java/kubatech/loaders/item/items/TeaCollection.java b/src/main/java/kubatech/loaders/item/items/TeaCollection.java index 85b74421b6..c0c20aa244 100644 --- a/src/main/java/kubatech/loaders/item/items/TeaCollection.java +++ b/src/main/java/kubatech/loaders/item/items/TeaCollection.java @@ -32,6 +32,7 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagString; import net.minecraft.stats.Achievement; import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumChatFormatting; @@ -66,6 +67,21 @@ public class TeaCollection extends ItemProxy { {1, 3} }; + boolean checkTeaOwner(ItemStack stack, String username) { + NBTTagCompound tag = stack.stackTagCompound; + if (tag == null || !stack.stackTagCompound.hasKey("TeaOwner")) return true; + return stack.stackTagCompound.getString("TeaOwner").equals(username); + } + + private boolean checkOrSetTeaOwner(ItemStack stack, String username) { + NBTTagCompound tag = stack.stackTagCompound; + if (tag == null || !stack.stackTagCompound.hasKey("TeaOwner")) { + stack.setTagInfo("TeaOwner", new NBTTagString(username)); + return true; + } + return stack.stackTagCompound.getString("TeaOwner").equals(username); + } + @Override public void ItemInit(int index) { super.ItemInit(index); @@ -87,9 +103,7 @@ public class TeaCollection extends ItemProxy { @Override public void addInformation(ItemStack stack, EntityPlayer entity, List tooltipList, boolean showDebugInfo) { - if (stack.stackTagCompound != null - && stack.stackTagCompound.hasKey("TeaOwner") - && !stack.stackTagCompound.getString("TeaOwner").equals(entity.getCommandSenderName())) { + if (!checkTeaOwner(stack, entity.getCommandSenderName())) { tooltipList.add(EnumChatFormatting.GRAY + "" + EnumChatFormatting.BOLD + "" + EnumChatFormatting.ITALIC + StatCollector.translateToLocal("kubaitem.notyours")); return; @@ -105,20 +119,16 @@ public class TeaCollection extends ItemProxy { } @Override - public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) { - if (p_77659_1_.stackTagCompound == null || !p_77659_1_.stackTagCompound.hasKey("TeaOwner")) return p_77659_1_; - if (!p_77659_1_.stackTagCompound.getString("TeaOwner").equals(p_77659_3_.getCommandSenderName())) - return p_77659_1_; - p_77659_3_.setItemInUse(p_77659_1_, 32); - return p_77659_1_; + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer entity) { + if (!checkTeaOwner(stack, entity.getCommandSenderName())) return stack; + entity.setItemInUse(stack, 32); + return stack; } @Override public ItemStack onEaten(ItemStack stack, World world, EntityPlayer entity) { if (world.isRemote) return stack; if (!(entity instanceof EntityPlayerMP)) return stack; - if (stack.stackTagCompound == null || !stack.stackTagCompound.hasKey("TeaOwner")) return stack; - if (!stack.stackTagCompound.getString("TeaOwner").equals(entity.getCommandSenderName())) return stack; entity.addChatComponentMessage(new ChatComponentText( EnumChatFormatting.GREEN + StatCollector.translateToLocal("kubaitem.teacollection.mmm"))); entity.triggerAchievement(achievement); @@ -133,11 +143,7 @@ public class TeaCollection extends ItemProxy { @Override public String getDisplayName(ItemStack stack) { if (!ModUtils.isClientSided) return super.getDisplayName(stack); - if (stack.stackTagCompound == null - || (!stack.stackTagCompound.hasKey("TeaOwner") - || stack.stackTagCompound - .getString("TeaOwner") - .equals(Minecraft.getMinecraft().thePlayer.getCommandSenderName()))) + if (checkTeaOwner(stack, Minecraft.getMinecraft().thePlayer.getCommandSenderName())) return super.getDisplayName(stack); return EnumChatFormatting.GOLD + "" + EnumChatFormatting.BOLD + "" + EnumChatFormatting.ITALIC + "???????"; } @@ -146,11 +152,9 @@ public class TeaCollection extends ItemProxy { public void onUpdate(ItemStack stack, World world, Entity entity, int slot, boolean isCurrentItem) { if (world.isRemote) return; if (!(entity instanceof EntityPlayerMP)) return; + checkOrSetTeaOwner(stack, entity.getCommandSenderName()); NBTTagCompound tag = stack.stackTagCompound; - if (tag == null) tag = stack.stackTagCompound = new NBTTagCompound(); if (tag.hasKey("display")) tag.removeTag("display"); - if (tag.hasKey("TeaOwner")) return; - tag.setString("TeaOwner", entity.getCommandSenderName()); } private static class TeaPage extends AchievementPage { diff --git a/src/main/java/kubatech/loaders/item/items/TeaUltimate.java b/src/main/java/kubatech/loaders/item/items/TeaUltimate.java index 1119de63d3..8a1d11a41a 100644 --- a/src/main/java/kubatech/loaders/item/items/TeaUltimate.java +++ b/src/main/java/kubatech/loaders/item/items/TeaUltimate.java @@ -19,13 +19,34 @@ package kubatech.loaders.item.items; +import com.gtnewhorizons.modularui.api.ModularUITextures; +import com.gtnewhorizons.modularui.api.drawable.IDrawable; +import com.gtnewhorizons.modularui.api.drawable.ItemDrawable; +import com.gtnewhorizons.modularui.api.drawable.Text; +import com.gtnewhorizons.modularui.api.math.Color; +import com.gtnewhorizons.modularui.api.screen.ModularWindow; +import com.gtnewhorizons.modularui.api.widget.Widget; +import com.gtnewhorizons.modularui.common.widget.*; +import java.text.NumberFormat; +import kubatech.api.enums.ItemList; import kubatech.api.utils.ModUtils; import kubatech.api.utils.StringUtils; +import kubatech.loaders.item.IItemProxyGUI; +import kubatech.savedata.PlayerData; +import kubatech.savedata.PlayerDataManager; import net.minecraft.client.Minecraft; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; import net.minecraft.util.EnumChatFormatting; +import net.minecraft.world.World; -public class TeaUltimate extends TeaCollection { +public class TeaUltimate extends TeaCollection implements IItemProxyGUI { public TeaUltimate() { super("ultimate_tea"); } @@ -34,22 +55,135 @@ public class TeaUltimate extends TeaCollection { private static long timeCounter = 0; private static int colorCounter = 0; + public static String getUltimateTeaDisplayName(String displayName) { + long current = System.currentTimeMillis(); + if (current - timeCounter > 100) { + timeCounter = current; + name = StringUtils.applyRainbow( + "ULTIMATE", colorCounter++, EnumChatFormatting.BOLD.toString() + EnumChatFormatting.OBFUSCATED); + } + return String.format(displayName, name + EnumChatFormatting.RESET); + } + @Override public String getDisplayName(ItemStack stack) { if (!ModUtils.isClientSided) return super.getDisplayName(stack); - if (stack.stackTagCompound == null - || (!stack.stackTagCompound.hasKey("TeaOwner") - || stack.stackTagCompound - .getString("TeaOwner") - .equals(Minecraft.getMinecraft().thePlayer.getCommandSenderName()))) { - long current = System.currentTimeMillis(); - if (current - timeCounter > 100) { - timeCounter = current; - name = StringUtils.applyRainbow( - "ULTIMATE", colorCounter++, EnumChatFormatting.BOLD.toString() + EnumChatFormatting.OBFUSCATED); - } - return String.format(super.getDisplayName(stack), name + EnumChatFormatting.RESET); + if (checkTeaOwner(stack, Minecraft.getMinecraft().thePlayer.getCommandSenderName())) { + return getUltimateTeaDisplayName(super.getDisplayName(stack)); } return EnumChatFormatting.GOLD + "" + EnumChatFormatting.BOLD + "" + EnumChatFormatting.ITALIC + "???????"; } + + @Override + public ModularWindow createWindow(ItemStack stack, EntityPlayer player) { + ModularWindow.Builder builder = ModularWindow.builder(200, 150); + builder.setBackground(ModularUITextures.VANILLA_BACKGROUND); + final PlayerData playerData = PlayerDataManager.getPlayer(player.getCommandSenderName()); + IDrawable tab1 = new ItemDrawable(ItemList.LegendaryUltimateTea.get(1)).withFixedSize(18, 18, 4, 6); + IDrawable tab2 = new ItemDrawable(new ItemStack(Blocks.crafting_table)).withFixedSize(18, 18, 4, 6); + IDrawable tab3 = new ItemDrawable(new ItemStack(Items.golden_apple)).withFixedSize(18, 18, 4, 6); + builder.widget(new TabContainer() + .setButtonSize(28, 32) + .addTabButton(new TabButton(0) + .setBackground(false, ModularUITextures.VANILLA_TAB_TOP_START.getSubArea(0, 0, 1f, 0.5f), tab1) + .setBackground(true, ModularUITextures.VANILLA_TAB_TOP_START.getSubArea(0, 0.5f, 1f, 1f), tab1) + .setPos(0, -28)) + .addTabButton(new TabButton(1) + .setBackground(false, ModularUITextures.VANILLA_TAB_TOP_MIDDLE.getSubArea(0, 0, 1f, 0.5f), tab2) + .setBackground(true, ModularUITextures.VANILLA_TAB_TOP_MIDDLE.getSubArea(0, 0.5f, 1f, 1f), tab2) + .setPos(28, -28)) + .addTabButton(new TabButton(2) + .setBackground(false, ModularUITextures.VANILLA_TAB_TOP_MIDDLE.getSubArea(0, 0, 1f, 0.5f), tab3) + .setBackground(true, ModularUITextures.VANILLA_TAB_TOP_MIDDLE.getSubArea(0, 0.5f, 1f, 1f), tab3) + .setPos(56, -28)) + .addPage(new MultiChildWidget() + .addChild(new TextWidget(new Text("STATUS") + .format(EnumChatFormatting.BOLD) + .format(EnumChatFormatting.GOLD) + .shadow()) + .setPos(10, 5)) + .addChild(new DynamicTextWidget(() -> new Text("Tea: " + + (playerData == null + ? "ERROR" + : NumberFormat.getInstance() + .format(playerData.teaAmount))) + .color(Color.GREEN.normal)) + .setPos(20, 20))) + .addPage(new MultiChildWidget() + .addChild(new TextWidget(new Text("EXCHANGE") + .format(EnumChatFormatting.BOLD) + .format(EnumChatFormatting.GOLD) + .shadow()) + .setPos(10, 5)) + .addChild(new ButtonWidget() + .setOnClick((Widget.ClickData clickData, Widget widget) -> { + if (!(player instanceof EntityPlayerMP)) return; + if (playerData == null || playerData.teaAmount < 50_000L) return; + playerData.teaAmount -= 50_000L; + playerData.markDirty(); + if (player.inventory.addItemStackToInventory( + ItemList.TeaAcceptorResearchNote.get(1))) return; + player.entityDropItem(ItemList.TeaAcceptorResearchNote.get(1), 0.5f); + }) + .setBackground(new ItemDrawable().setItem(ItemList.TeaAcceptorResearchNote.get(1))) + .addTooltip("Tea Acceptor Research Note") + .addTooltip(new Text("Cost: " + + NumberFormat.getInstance().format(50_000) + " Tea") + .color(Color.GRAY.normal)) + .setPos(20, 20))) + .addPage( + new MultiChildWidget() + .addChild(new TextWidget(new Text("BENEFITS") + .format(EnumChatFormatting.BOLD) + .format(EnumChatFormatting.GOLD) + .shadow()) + .setPos(10, 5)) + /*.addChild(new ButtonWidget() + .setOnClick((Widget.ClickData clickData, Widget widget) -> { + if (!(player instanceof EntityPlayerMP)) return; + if (playerData == null) return; + playerData.autoRegen = !playerData.autoRegen; + playerData.markDirty(); + }) + .setBackground(new ItemDrawable().setItem(new ItemStack(Items.potionitem, 1, 8193))) + .addTooltip("Regeneration I") + .addTooltip("For 1 minute") + .addTooltip(new Text("Cost: " + + NumberFormat.getInstance().format(75_000) + " Tea") + .color(Color.GRAY.normal)) + // .addTooltip( //Find a way to run that on server, or different approach + // new Text("Autobuy: " + (playerData == null ? "ERROR" : playerData.autoRegen)) + // .color(Color.GREY.normal)) + .setPos(20, 20))*/ )); + return builder.build(); + } + + @Override + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer entity) { + if (world.isRemote) return stack; + if (!(entity instanceof EntityPlayerMP)) return stack; + if (!checkTeaOwner(stack, entity.getCommandSenderName())) return stack; + openHeldItemGUI(entity); + return stack; + } + + @Override + public void onUpdate(ItemStack stack, World world, Entity entity, int slot, boolean isCurrentItem) { + if (world.isRemote) return; + if (!(entity instanceof EntityPlayerMP)) return; + super.onUpdate(stack, world, entity, slot, isCurrentItem); + if (checkTeaOwner(stack, entity.getCommandSenderName())) { + PlayerData playerData = PlayerDataManager.getPlayer(entity.getCommandSenderName()); + if (playerData == null) return; + playerData.teaAmount++; + playerData.markDirty(); + + if (playerData.autoRegen && playerData.teaAmount > 75_000) { + if (((EntityPlayerMP) entity).getActivePotionEffect(Potion.regeneration) == null) { + ((EntityPlayerMP) entity).addPotionEffect(new PotionEffect(Potion.regeneration.id, 1200, 0, true)); + playerData.teaAmount -= 75_000; + } + } + } + } } diff --git a/src/main/java/kubatech/mixin/Mixin.java b/src/main/java/kubatech/mixin/Mixin.java index 01bb73089a..2a3259ef60 100644 --- a/src/main/java/kubatech/mixin/Mixin.java +++ b/src/main/java/kubatech/mixin/Mixin.java @@ -9,7 +9,8 @@ import java.util.List; public enum Mixin { // Minecraft - EnchantmentHelperMixin("minecraft.EnchantmentHelperMixin", VANILLA); + EnchantmentHelperMixin("minecraft.EnchantmentHelperMixin", VANILLA), + WorldMixin("minecraft.WorldMixin", VANILLA); public final String mixinClass; public final List targetedMods; diff --git a/src/main/java/kubatech/mixin/mixins/minecraft/WorldMixin.java b/src/main/java/kubatech/mixin/mixins/minecraft/WorldMixin.java new file mode 100644 index 0000000000..320917c694 --- /dev/null +++ b/src/main/java/kubatech/mixin/mixins/minecraft/WorldMixin.java @@ -0,0 +1,21 @@ +package kubatech.mixin.mixins.minecraft; + +import kubatech.loaders.BlockLoader; +import net.minecraft.block.Block; +import net.minecraft.world.World; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@SuppressWarnings("unused") +@Mixin(value = World.class) +public class WorldMixin { + + @SuppressWarnings("ConstantConditions") + @Inject(method = "getBlock", at = @At("RETURN"), require = 1) + private void getBlockDetector(int x, int y, int z, CallbackInfoReturnable callbackInfoReturnable) { + if (callbackInfoReturnable.getReturnValue() == BlockLoader.kubaBlock) + BlockLoader.kubaBlock.setLastBlockAccess((World) (Object) this, x, y, z); + } +} diff --git a/src/main/java/kubat