diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java b/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java index ca400bf85..e1c8d4b19 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java @@ -24,7 +24,6 @@ import de.ellpeck.actuallyadditions.mod.fluids.InitFluids; import de.ellpeck.actuallyadditions.mod.gen.InitVillager; import de.ellpeck.actuallyadditions.mod.gen.OreGen; import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.mod.items.InitForeignPaxels; import de.ellpeck.actuallyadditions.mod.items.InitItems; import de.ellpeck.actuallyadditions.mod.items.ItemCoffee; import de.ellpeck.actuallyadditions.mod.items.lens.LensRecipeHandler; @@ -136,7 +135,6 @@ public class ActuallyAdditions{ TreasureChestHandler.init(); LensRecipeHandler.init(); EmpowererHandler.init(); - InitForeignPaxels.init(); InitBooklet.postInit(); proxy.postInit(event); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigBoolValues.java b/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigBoolValues.java index 121df6493..be36ac572 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigBoolValues.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigBoolValues.java @@ -25,10 +25,6 @@ public enum ConfigBoolValues{ DO_CAT_DROPS("Do Cat Drops", ConfigCategories.OTHER, true, "If Cats drop Hairy Balls on Occasion"), WORMS("Worms", ConfigCategories.OTHER, true, "If worms should drop from tilling the ground"), - TF_PAXELS("Thermal Foundation Paxels", ConfigCategories.OTHER, true, "If Paxels made of Thermal Foundation Materials should exist"), - MT_PAXELS("MekanismTools Paxels", ConfigCategories.OTHER, true, "If Paxels made of MekanismTools Materials should exist"), - SO_PAXELS("Simpleores Paxels", ConfigCategories.OTHER, true, "If Paxels made of SimpleOres Materials should exist"), - DO_RICE_GEN("Rice Gen", ConfigCategories.WORLD_GEN, true, "If Rice should generate in the World"), DO_CANOLA_GEN("Canola Gen", ConfigCategories.WORLD_GEN, true, "If Canola should generate in the World"), DO_FLAX_GEN("Flax Gen", ConfigCategories.WORLD_GEN, true, "If Flax should generate in the World"), diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java b/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java index 30d778d83..a2f9e9ed6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java @@ -12,7 +12,6 @@ package de.ellpeck.actuallyadditions.mod.creative; import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; import de.ellpeck.actuallyadditions.mod.fluids.InitFluids; -import de.ellpeck.actuallyadditions.mod.items.InitForeignPaxels; import de.ellpeck.actuallyadditions.mod.items.InitItems; import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.block.Block; @@ -232,7 +231,6 @@ public class CreativeTab extends CreativeTabs{ this.add(InitItems.itemPaxelCrystalBlack); this.add(InitItems.itemPaxelCrystalGreen); this.add(InitItems.itemPaxelCrystalWhite); - InitForeignPaxels.addToCreativeTab(); this.add(InitBlocks.blockCrystal); this.add(InitBlocks.blockCrystalEmpowered); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitForeignPaxels.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitForeignPaxels.java deleted file mode 100644 index 6bb6368b2..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitForeignPaxels.java +++ /dev/null @@ -1,150 +0,0 @@ -/* - * This file ("InitForeignPaxels.java") is part of the Actually Additions mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://ellpeck.de/actaddlicense - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2015-2016 Ellpeck - */ - -package de.ellpeck.actuallyadditions.mod.items; - -import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.mod.config.values.ConfigCrafting; -import de.ellpeck.actuallyadditions.mod.crafting.ToolCrafting; -import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; -import de.ellpeck.actuallyadditions.mod.util.ItemUtil; -import de.ellpeck.actuallyadditions.mod.util.ModUtil; -import de.ellpeck.actuallyadditions.mod.util.RecipeUtil; -import net.minecraft.item.EnumRarity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemTool; -import net.minecraftforge.fml.common.Loader; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.oredict.ShapelessOreRecipe; - -public final class InitForeignPaxels{ - - public static final int[] MT_COLORS = new int[]{4166, 2248890, 8882649, 12410135, 11451392, 3684412}; - public static final String[] MT_NAMES = new String[]{"Obsidian", "LapisLazuli", "Osmium", "Bronze", "Glowstone", "Steel"}; - public static final int[] TF_COLORS = new int[]{13332762, 5407943, 5407895, 5394789, 12960613, 12960653, 12410135, 2999795, 10143162}; - public static final int[] SO_COLORS = new int[]{9409450, 2040021, 5714944, 526344, 545032}; - public static final Item[] TF_PAXELS = new Item[9]; - public static final Item[] SO_PAXELS = new Item[5]; - //MekanismTools - private static final String MEKANISM_TOOLS = "MekanismTools"; - private static final String[] MT_REPAIR_NAMES = new String[]{"ingotRefinedObsidian", "gemLapis", "ingotOsmium", "ingotBronze", "ingotRefinedGlowstone", "ingotSteel"}; - //ThermalFoundation - private static final String THERMAL_FOUNDATION = "ThermalFoundation"; - private static final String[] TF_NAMES = new String[]{"Copper", "Tin", "Silver", "Lead", "Nickel", "Electrum", "Bronze", "Platinum", "Invar"}; - //SimpleOres - private static final String SIMPLE_ORES = "simpleores"; - private static final String[] SO_NAMES = new String[]{"tin", "mythril", "copper", "onyx", "adamantium"}; - private static final String[] SO_REPAIR_NAMES = new String[]{"ingotTin", "ingotMythril", "ingotCopper", "gemOnyx", "ingotAdamantium"}; - private static final Item[] MT_PAXELS = new Item[6]; - - public static void init(){ - //SimpleOres - if(ConfigBoolValues.SO_PAXELS.isEnabled()){ - if(Loader.isModLoaded(SIMPLE_ORES)){ - ModUtil.LOGGER.info("Initializing "+SIMPLE_ORES+" AIOTs..."); - - for(int i = 0; i < SO_PAXELS.length; i++){ - Item axe = ItemUtil.getItemFromName(SIMPLE_ORES+":"+SO_NAMES[i]+"_axe"); - Item pickaxe = ItemUtil.getItemFromName(SIMPLE_ORES+":"+SO_NAMES[i]+"_pickaxe"); - Item hoe = ItemUtil.getItemFromName(SIMPLE_ORES+":"+SO_NAMES[i]+"_hoe"); - Item sword = ItemUtil.getItemFromName(SIMPLE_ORES+":"+SO_NAMES[i]+"_sword"); - Item shovel = ItemUtil.getItemFromName(SIMPLE_ORES+":"+SO_NAMES[i]+"_shovel"); - - if(axe != null && pickaxe != null && hoe != null && sword != null && shovel != null && axe instanceof ItemTool){ - Item.ToolMaterial material = ((ItemTool)axe).getToolMaterial(); - SO_PAXELS[i] = new ItemAllToolAA(material, SO_REPAIR_NAMES[i], "paxelSO"+SO_NAMES[i], EnumRarity.RARE, SO_COLORS[i]); - - if(ConfigCrafting.PAXELS.isEnabled()){ - GameRegistry.addRecipe(new ShapelessOreRecipe(SO_PAXELS[i], axe, pickaxe, hoe, sword, shovel)); - ToolCrafting.RECIPES_PAXELS.add(RecipeUtil.lastIRecipe()); - } - } - } - } - else{ - ModUtil.LOGGER.info(SIMPLE_ORES+" not loaded, can't initialize Special AIOTs."); - } - } - - //MekanismTools - if(ConfigBoolValues.MT_PAXELS.isEnabled()){ - if(Loader.isModLoaded(MEKANISM_TOOLS)){ - ModUtil.LOGGER.info("Initializing "+MEKANISM_TOOLS+" AIOTs..."); - - for(int i = 0; i < MT_PAXELS.length; i++){ - Item axe = ItemUtil.getItemFromName(MEKANISM_TOOLS+":"+MT_NAMES[i]+"Axe"); - Item pickaxe = ItemUtil.getItemFromName(MEKANISM_TOOLS+":"+MT_NAMES[i]+"Pickaxe"); - Item hoe = ItemUtil.getItemFromName(MEKANISM_TOOLS+":"+MT_NAMES[i]+"Hoe"); - Item sword = ItemUtil.getItemFromName(MEKANISM_TOOLS+":"+MT_NAMES[i]+"Sword"); - Item shovel = ItemUtil.getItemFromName(MEKANISM_TOOLS+":"+MT_NAMES[i]+"Shovel"); - - if(axe != null && pickaxe != null && hoe != null && sword != null && shovel != null && axe instanceof ItemTool){ - Item.ToolMaterial material = ((ItemTool)axe).getToolMaterial(); - MT_PAXELS[i] = new ItemAllToolAA(material, MT_REPAIR_NAMES[i], "paxelMT"+MT_NAMES[i], EnumRarity.RARE, MT_COLORS[i]); - - if(ConfigCrafting.PAXELS.isEnabled()){ - GameRegistry.addRecipe(new ShapelessOreRecipe(MT_PAXELS[i], axe, pickaxe, hoe, sword, shovel)); - ToolCrafting.RECIPES_PAXELS.add(RecipeUtil.lastIRecipe()); - } - } - } - } - else{ - ModUtil.LOGGER.info(MEKANISM_TOOLS+" not loaded, can't initialize Special AIOTs."); - } - } - - //ThermalFoundation - if(ConfigBoolValues.TF_PAXELS.isEnabled()){ - if(Loader.isModLoaded(THERMAL_FOUNDATION)){ - ModUtil.LOGGER.info("Initializing "+THERMAL_FOUNDATION+" AIOTs..."); - - for(int i = 0; i < TF_PAXELS.length; i++){ - Item axe = ItemUtil.getItemFromName(THERMAL_FOUNDATION+":tool.axe"+TF_NAMES[i]); - Item pickaxe = ItemUtil.getItemFromName(THERMAL_FOUNDATION+":tool.pickaxe"+TF_NAMES[i]); - Item hoe = ItemUtil.getItemFromName(THERMAL_FOUNDATION+":tool.hoe"+TF_NAMES[i]); - Item sword = ItemUtil.getItemFromName(THERMAL_FOUNDATION+":tool.sword"+TF_NAMES[i]); - Item shovel = ItemUtil.getItemFromName(THERMAL_FOUNDATION+":tool.shovel"+TF_NAMES[i]); - - if(axe != null && pickaxe != null && hoe != null && sword != null && shovel != null && axe instanceof ItemTool){ - Item.ToolMaterial material = ((ItemTool)axe).getToolMaterial(); - TF_PAXELS[i] = new ItemAllToolAA(material, "ingot"+TF_NAMES[i], "paxelTF"+TF_NAMES[i], EnumRarity.RARE, TF_COLORS[i]); - - if(ConfigCrafting.PAXELS.isEnabled()){ - GameRegistry.addRecipe(new ShapelessOreRecipe(TF_PAXELS[i], axe, pickaxe, hoe, sword, shovel)); - ToolCrafting.RECIPES_PAXELS.add(RecipeUtil.lastIRecipe()); - } - } - } - } - else{ - ModUtil.LOGGER.info(THERMAL_FOUNDATION+" not loaded, can't initialize Special AIOTs."); - } - } - } - - public static void addToCreativeTab(){ - for(Item item : TF_PAXELS){ - if(item != null){ - CreativeTab.INSTANCE.add(item); - } - } - for(Item item : MT_PAXELS){ - if(item != null){ - CreativeTab.INSTANCE.add(item); - } - } - for(Item item : SO_PAXELS){ - if(item != null){ - CreativeTab.INSTANCE.add(item); - } - } - } -} diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index 169731a03..1cece4f28 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -308,26 +308,6 @@ item.actuallyadditions.diamondPaxel.name=Diamond AIOT item.actuallyadditions.emeraldPaxel.name=Emerald AIOT item.actuallyadditions.obsidianPaxel.name=Obsidian AIOT item.actuallyadditions.quartzPaxel.name=Black Quartz AIOT -item.actuallyadditions.paxelTFCopper.name=TF Copper AIOT -item.actuallyadditions.paxelTFTin.name=TF Tin AIOT -item.actuallyadditions.paxelTFLead.name=TF Lead AIOT -item.actuallyadditions.paxelTFSilver.name=TF Silver AIOT -item.actuallyadditions.paxelTFElectrum.name=TF Electrum AIOT -item.actuallyadditions.paxelTFNickel.name=TF Ferrous AIOT -item.actuallyadditions.paxelTFBronze.name=TF Bronze AIOT -item.actuallyadditions.paxelTFPlatinum.name=TF Shiny AIOT -item.actuallyadditions.paxelTFInvar.name=TF Invar AIOT -item.actuallyadditions.paxelMTObsidian.name=MT Obsidian AIOT -item.actuallyadditions.paxelMTGlowstone.name=MT Glowstone AIOT -item.actuallyadditions.paxelMTLapisLazuli.name=MT Lapis Lazuli AIOT -item.actuallyadditions.paxelMTOsmium.name=MT Osmium AIOT -item.actuallyadditions.paxelMTBronze.name=MT Bronze AIOT -item.actuallyadditions.paxelMTSteel.name=MT Steel AIOT -item.actuallyadditions.paxelSOadamantium.name=SO Adamantium AIOT -item.actuallyadditions.paxelSOcopper.name=SO Copper AIOT -item.actuallyadditions.paxelSOtin.name=SO Tin AIOT -item.actuallyadditions.paxelSOonyx.name=SO Onyx AIOT -item.actuallyadditions.paxelSOmythril.name=SO Mythril AIOT item.actuallyadditions.itemPhantomConnector.name=Phantom Connector item.actuallyadditions.itemMiscCup.name=Empty Cup item.actuallyadditions.itemCoffee.name=Cup with Coffee @@ -864,7 +844,7 @@ booklet.actuallyadditions.chapter.leafBlower.name=Leaf Blowers booklet.actuallyadditions.chapter.leafBlower.text.1=The Leaf Blower can blow away tall grass, flowers and other stuff around you when you hold right-click. There is an Advanced Leaf Blower, which works like the basic one, except that it operates much faster and also breaks Leaves. booklet.actuallyadditions.chapter.aiots.name=All-In-One-Tools (AIOTs) -booklet.actuallyadditions.chapter.aiots.text.1=An All-In-One-Tool is a tool that is Pickaxe, Axe, Shovel, Sword and Hoe in one. They are available in every material and if you have Thermal Foundation or MekanismTools installed, there are even AIOTs made of their materials! +booklet.actuallyadditions.chapter.aiots.text.1=An All-In-One-Tool is a tool that is Pickaxe, Axe, Shovel, Sword and Hoe in one. They are available in every common material. booklet.actuallyadditions.chapter.jams.name=Jams booklet.actuallyadditions.chapter.jams.text.1=Once, there was a Kitty who really wanted some Jam. So I made some Jam. Seriously, this is Jam. You can find it in Village Houses or buy it from the Jam Villager. Every Jam gives you two different potion effects!