From 18c04a07c0a6afccc1620da8e4df5f96d20147e3 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Wed, 8 Mar 2017 19:01:02 +0100 Subject: [PATCH] gonna rethink a couple things for this --- .../mod/crafting/BlockCrafting.java | 11 ++-- .../mod/crafting/InitCrafting.java | 7 --- .../mod/creative/CreativeTab.java | 5 -- .../mod/items/InitItems.java | 6 -- .../mod/items/ItemCrystalChisel.java | 62 ------------------- .../assets/actuallyadditions/lang/en_US.lang | 2 + 6 files changed, 7 insertions(+), 86 deletions(-) delete mode 100644 src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystalChisel.java diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java index 16dcefd5a..b8142f999 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java @@ -104,7 +104,6 @@ public final class BlockCrafting{ GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitBlocks.blockFluidPlacer), new ItemStack(InitBlocks.blockFluidPlacer))); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitBlocks.blockFluidCollector), new ItemStack(InitBlocks.blockFluidCollector))); - //Battery Box GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitBlocks.blockBatteryBox), new ItemStack(InitBlocks.blockEnergizer), @@ -234,11 +233,11 @@ public final class BlockCrafting{ 'X', new ItemStack(InitBlocks.blockTestifiBucksGreenWall))); //Atomic Reconstructor - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockAtomicReconstructor), - "IRI", "RCR", "IRI", - 'R', "dustRedstone", - 'I', "ingotIron", - 'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()))); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockAtomicReconstructor), + "IRI", "RCR", "IRI", + 'R', "dustRedstone", + 'I', "ingotIron", + 'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()))); recipeAtomicReconstructor = RecipeUtil.lastIRecipe(); //Laser Relay diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/InitCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/InitCrafting.java index 218c4b64f..5df9091ce 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/InitCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/InitCrafting.java @@ -11,13 +11,11 @@ package de.ellpeck.actuallyadditions.mod.crafting; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.fluids.InitFluids; import de.ellpeck.actuallyadditions.mod.items.InitItems; import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; import de.ellpeck.actuallyadditions.mod.misc.apiimpl.farmer.*; import de.ellpeck.actuallyadditions.mod.util.ModUtil; -import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.registry.GameRegistry; @@ -56,11 +54,6 @@ public final class InitCrafting{ GameRegistry.addRecipe(new RecipeBioMash()); RecipeSorter.register(ModUtil.MOD_ID+":recipeBioMash", RecipeBioMash.class, RecipeSorter.Category.SHAPELESS, "after:minecraft:shapeless"); - - if(ActuallyAdditions.isCaveMode){ - ActuallyAdditionsAPI.addCompostRecipe(new ItemStack(Blocks.LEAVES, 1, Util.WILDCARD), Blocks.LEAVES, new ItemStack(Blocks.DIRT), Blocks.DIRT); - ActuallyAdditionsAPI.addCompostRecipe(new ItemStack(Blocks.LEAVES2, 1, Util.WILDCARD), Blocks.LEAVES2, new ItemStack(Blocks.DIRT), Blocks.DIRT); - } } } 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 185cd5388..abd1108d9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java @@ -10,7 +10,6 @@ package de.ellpeck.actuallyadditions.mod.creative; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; import de.ellpeck.actuallyadditions.mod.fluids.InitFluids; import de.ellpeck.actuallyadditions.mod.items.InitItems; @@ -149,10 +148,6 @@ public class CreativeTab extends CreativeTabs{ this.add(InitBlocks.blockBlackLotus); - if(ActuallyAdditions.isCaveMode){ - this.add(InitItems.itemCrystalChisel); - } - this.add(InitItems.itemBag); this.add(InitItems.itemVoidBag); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitItems.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitItems.java index b01313e4d..54c0b9615 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitItems.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitItems.java @@ -11,7 +11,6 @@ package de.ellpeck.actuallyadditions.mod.items; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; import de.ellpeck.actuallyadditions.mod.items.base.*; import de.ellpeck.actuallyadditions.mod.items.lens.ItemLens; @@ -199,15 +198,10 @@ public final class InitItems{ public static Item itemEngineerGoggles; public static Item itemEngineerGogglesAdvanced; public static Item itemCrystalShard; - public static Item itemCrystalChisel; public static void init(){ ModUtil.LOGGER.info("Initializing Items..."); - if(ActuallyAdditions.isCaveMode){ - itemCrystalChisel = new ItemCrystalChisel("item_crystal_chisel"); - } - itemCrystalShard = new ItemCrystalShard("item_crystal_shard"); itemEngineerGogglesAdvanced = new ItemEngineerGoggles("item_engineer_goggles_advanced", true); itemEngineerGoggles = new ItemEngineerGoggles("item_engineer_goggles", false); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystalChisel.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystalChisel.java deleted file mode 100644 index 3e97a4e47..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystalChisel.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * This file ("ItemCrystalChisel.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-2017 Ellpeck - */ - -package de.ellpeck.actuallyadditions.mod.items; - -import de.ellpeck.actuallyadditions.mod.blocks.BlockCrystalCluster; -import de.ellpeck.actuallyadditions.mod.cave.WorldTypeCave; -import de.ellpeck.actuallyadditions.mod.gen.WorldGenLushCaves; -import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraftforge.common.util.FakePlayer; -import org.apache.commons.lang3.ArrayUtils; - -public class ItemCrystalChisel extends ItemBase{ - - public ItemCrystalChisel(String name){ - super(name); - - this.setMaxStackSize(1); - this.setMaxDamage(64); - } - - @Override - public boolean canHarvestBlock(IBlockState block){ - return block.getBlock() instanceof BlockCrystalCluster; - } - - @Override - public boolean onBlockStartBreak(ItemStack stack, BlockPos pos, EntityPlayer player){ - if(WorldTypeCave.is(player.world) && !(player instanceof FakePlayer)){ - IBlockState state = player.world.getBlockState(pos); - if(state.getBlock() instanceof BlockCrystalCluster){ - int index = ArrayUtils.indexOf(WorldGenLushCaves.CRYSTAL_CLUSTERS, state.getBlock()); - if(index >= 0){ - if(!player.world.isRemote){ - if(player.world.rand.nextBoolean()){ - ItemStack drop = new ItemStack(InitItems.itemCrystalShard, player.world.rand.nextInt(3)+1, index); - EntityItem item = new EntityItem(player.world, pos.getX()+0.5, pos.getY()+0.5, pos.getZ()+0.5, drop); - player.world.spawnEntity(item); - } - - stack.damageItem(1, player); - } - - return true; - } - } - } - return false; - } -} diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index 3bc9741ff..e8dee1c0e 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -1,6 +1,8 @@ #General itemGroup.actuallyadditions=Actually Additions achievement.page.actuallyadditions=Actually Additions +generator.actaddcaves=AA Cave Mode +generator.actaddcaves.info=Actually Additions Cave Mode (like Skyblock but in a cave and with Actually Additions) actuallyadditions.lolWutHowUDoDis.name=This is bugged. Throw it away. Please. #Fluids