diff options
| author | Jakub <53441451+kuba6000@users.noreply.github.com> | 2022-08-29 16:04:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-29 16:04:28 +0200 |
| commit | 7d1f51a8937e0a86486267437d444696e81e8aa0 (patch) | |
| tree | a5b145e7271998f7b4b968a2212ed487e54a92b5 /src/main/java/gtPlusPlus/core/creative | |
| parent | 5267969156d30b4bb5f4cb2279ebb49db6bd40e2 (diff) | |
| download | GT5-Unofficial-7d1f51a8937e0a86486267437d444696e81e8aa0.tar.gz GT5-Unofficial-7d1f51a8937e0a86486267437d444696e81e8aa0.tar.bz2 GT5-Unofficial-7d1f51a8937e0a86486267437d444696e81e8aa0.zip | |
Buildscript + Spotless (#318)
* Convert AES.java to readable class
* Buildscript
* Spotless
Diffstat (limited to 'src/main/java/gtPlusPlus/core/creative')
6 files changed, 64 insertions, 81 deletions
diff --git a/src/main/java/gtPlusPlus/core/creative/AddToCreativeTab.java b/src/main/java/gtPlusPlus/core/creative/AddToCreativeTab.java index 218bef46bd..f0fb71112b 100644 --- a/src/main/java/gtPlusPlus/core/creative/AddToCreativeTab.java +++ b/src/main/java/gtPlusPlus/core/creative/AddToCreativeTab.java @@ -1,35 +1,33 @@ package gtPlusPlus.core.creative; -import net.minecraft.creativetab.CreativeTabs; import gregtech.api.util.GT_CreativeTab; import gtPlusPlus.core.creative.tabs.*; -import gtPlusPlus.xmod.bop.creative.MiscUtilsBOPTab; +import net.minecraft.creativetab.CreativeTabs; public class AddToCreativeTab { - public static CreativeTabs tabBlock; - public static CreativeTabs tabMisc; - public static CreativeTabs tabCombat; - public static CreativeTabs tabTools; - public static CreativeTabs tabMachines; - public static CreativeTabs tabOther; - public static CreativeTabs tabBOP; + public static CreativeTabs tabBlock; + public static CreativeTabs tabMisc; + public static CreativeTabs tabCombat; + public static CreativeTabs tabTools; + public static CreativeTabs tabMachines; + public static CreativeTabs tabOther; + public static CreativeTabs tabBOP; + + public static void initialiseTabs() { + // GT_CreativeTab + /*tabBlock = new MiscUtilCreativeTabBlock("MiscUtilBlockTab"); + tabMisc = new MiscUtilCreativeTabMisc("MiscUtilMiscTab"); + tabTools = new MiscUtilCreativeTabTools("MiscUtilToolsTab"); + tabMachines = new MiscUtilCreativeTabMachines("MiscUtilMachineTab"); + tabOther = new MiscUtilCreativeTabOther("MiscUtilOtherTab"); + tabBOP = new MiscUtilsBOPTab("MiscUtilBOP");*/ - public static void initialiseTabs() { - //GT_CreativeTab - /*tabBlock = new MiscUtilCreativeTabBlock("MiscUtilBlockTab"); - tabMisc = new MiscUtilCreativeTabMisc("MiscUtilMiscTab"); - tabTools = new MiscUtilCreativeTabTools("MiscUtilToolsTab"); - tabMachines = new MiscUtilCreativeTabMachines("MiscUtilMachineTab"); - tabOther = new MiscUtilCreativeTabOther("MiscUtilOtherTab"); - tabBOP = new MiscUtilsBOPTab("MiscUtilBOP");*/ - - tabBlock = new GT_CreativeTab("GTPP_BLOCKS", "GT++ Blocks"); - tabMisc = new GT_CreativeTab("GTPP_MISC", "GT++ Misc"); - tabTools = new GT_CreativeTab("GTPP_TOOLS", "GT++ Tools"); - tabMachines = new GT_CreativeTab("GTPP_MACHINES", "GT++ Machines"); - tabOther = new GT_CreativeTab("GTPP_OTHER", "GT++ Other"); - tabBOP = new GT_CreativeTab("GTPP_OTHER_2", "GT++ Other II"); - - } + tabBlock = new GT_CreativeTab("GTPP_BLOCKS", "GT++ Blocks"); + tabMisc = new GT_CreativeTab("GTPP_MISC", "GT++ Misc"); + tabTools = new GT_CreativeTab("GTPP_TOOLS", "GT++ Tools"); + tabMachines = new GT_CreativeTab("GTPP_MACHINES", "GT++ Machines"); + tabOther = new GT_CreativeTab("GTPP_OTHER", "GT++ Other"); + tabBOP = new GT_CreativeTab("GTPP_OTHER_2", "GT++ Other II"); + } } diff --git a/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java b/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java index 2851a514d0..7cb10f1092 100644 --- a/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java +++ b/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java @@ -1,27 +1,25 @@ package gtPlusPlus.core.creative.tabs; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; import net.minecraft.item.Item; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.block.ModBlocks; public class MiscUtilCreativeTabBlock extends CreativeTabs { - public MiscUtilCreativeTabBlock(final String lable) { - super(lable); - } + public MiscUtilCreativeTabBlock(final String lable) { + super(lable); + } + + @Override + public Item getTabIconItem() { + return Item.getItemFromBlock(Blocks.bedrock); + } - @Override - public Item getTabIconItem() { - return Item.getItemFromBlock(Blocks.bedrock); - } - @SideOnly(Side.CLIENT) - @Override - public int func_151243_f(){ + @Override + public int func_151243_f() { return 0; } - } diff --git a/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMachines.java b/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMachines.java index 96c809c4da..57fb663d40 100644 --- a/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMachines.java +++ b/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMachines.java @@ -4,18 +4,14 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Items; import net.minecraft.item.Item; -import gtPlusPlus.core.item.ModItems; - public class MiscUtilCreativeTabMachines extends CreativeTabs { + public MiscUtilCreativeTabMachines(final String lable) { + super(lable); + } - public MiscUtilCreativeTabMachines(final String lable) { - super(lable); - } - - @Override - public Item getTabIconItem() { - return Items.netherbrick; - } - + @Override + public Item getTabIconItem() { + return Items.netherbrick; + } } diff --git a/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMisc.java b/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMisc.java index a67668bbf0..397474065f 100644 --- a/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMisc.java +++ b/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMisc.java @@ -4,17 +4,14 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Items; import net.minecraft.item.Item; -import gtPlusPlus.core.item.ModItems; - public class MiscUtilCreativeTabMisc extends CreativeTabs { - public MiscUtilCreativeTabMisc(final String lable) { - super(lable); - } - - @Override - public Item getTabIconItem() { - return Items.painting; - } + public MiscUtilCreativeTabMisc(final String lable) { + super(lable); + } + @Override + public Item getTabIconItem() { + return Items.painting; + } } diff --git a/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabOther.java b/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabOther.java index afd89346c0..7fb99db6f0 100644 --- a/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabOther.java +++ b/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabOther.java @@ -4,17 +4,14 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Items; import net.minecraft.item.Item; -import gtPlusPlus.core.item.ModItems; - public class MiscUtilCreativeTabOther extends CreativeTabs { - public MiscUtilCreativeTabOther(final String lable) { - super(lable); - } - - @Override - public Item getTabIconItem() { - return Items.repeater; - } + public MiscUtilCreativeTabOther(final String lable) { + super(lable); + } + @Override + public Item getTabIconItem() { + return Items.repeater; + } } diff --git a/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabTools.java b/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabTools.java index ab1ab069de..1c81c6b952 100644 --- a/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabTools.java +++ b/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabTools.java @@ -4,17 +4,14 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Items; import net.minecraft.item.Item; -import gtPlusPlus.core.item.ModItems; - public class MiscUtilCreativeTabTools extends CreativeTabs { - public MiscUtilCreativeTabTools(final String lable) { - super(lable); - } - - @Override - public Item getTabIconItem() { - return Items.diamond_pickaxe; - } + public MiscUtilCreativeTabTools(final String lable) { + super(lable); + } + @Override + public Item getTabIconItem() { + return Items.diamond_pickaxe; + } } |
