From d0878c731ba4702a8dcb3693c5d472df7703d036 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 14 Mar 2019 00:54:29 -0500 Subject: [PATCH] more cleaning --- build.gradle | 2 +- .../client/core/handler/DebugHandler.java | 12 +++-- .../client/core/proxy/ClientProxy.java | 1 - .../client/gui/bag/ContainerFlowerBag.java | 5 ++- .../client/model/FloatingFlowerModel.java | 7 +-- .../client/model/SpecialFlowerModel.java | 38 ++++++++-------- .../botania/common/block/ModBlocks.java | 4 +- .../corporea/BlockCorporeaCrystalCube.java | 19 +++----- .../botania/common/block/tile/TilePylon.java | 5 ++- .../common/crafting/ModCraftingRecipes.java | 4 -- .../crafting/ModManaConjurationRecipes.java | 36 ++++++++------- .../recipe/SpecialFloatingFlowerRecipe.java | 4 +- .../common/entity/EntityDoppleganger.java | 2 +- .../vazkii/botania/common/item/ItemElven.java | 4 +- .../vazkii/botania/common/item/ModItems.java | 45 +++++++++---------- .../item/material/ItemManaResource.java | 44 ++++-------------- ...eAndMortar.java => ItemSelfReturning.java} | 4 +- src/main/resources/META-INF/botania_at.cfg | 10 ++--- .../smelting/metamoprhic_mountain_stone.json | 9 ++++ .../smelting/metamoprhic_plains_stone.json | 9 ++++ .../smelting/metamorphic_desert_stone.json | 9 ++++ .../smelting/metamorphic_forest_stone.json | 9 ++++ .../smelting/metamorphic_fungal_stone.json | 9 ++++ .../smelting/metamorphic_mesa_stone.json | 9 ++++ .../smelting/metamorphic_swamp_stone.json | 9 ++++ .../smelting/metamorphic_taiga_stone.json | 9 ++++ 26 files changed, 183 insertions(+), 135 deletions(-) rename src/main/java/vazkii/botania/common/item/material/{ItemPestleAndMortar.java => ItemSelfReturning.java} (87%) create mode 100644 src/main/resources/data/botania/recipes/smelting/metamoprhic_mountain_stone.json create mode 100644 src/main/resources/data/botania/recipes/smelting/metamoprhic_plains_stone.json create mode 100644 src/main/resources/data/botania/recipes/smelting/metamorphic_desert_stone.json create mode 100644 src/main/resources/data/botania/recipes/smelting/metamorphic_forest_stone.json create mode 100644 src/main/resources/data/botania/recipes/smelting/metamorphic_fungal_stone.json create mode 100644 src/main/resources/data/botania/recipes/smelting/metamorphic_mesa_stone.json create mode 100644 src/main/resources/data/botania/recipes/smelting/metamorphic_swamp_stone.json create mode 100644 src/main/resources/data/botania/recipes/smelting/metamorphic_taiga_stone.json diff --git a/build.gradle b/build.gradle index ad3949741..11fe2e3f4 100644 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,7 @@ archivesBaseName = config.mod_name sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' minecraft { - mappings channel: 'snapshot', version: '20190214-1.13.1' + mappings channel: 'snapshot', version: '20190313-1.13.2' accessTransformer = file('src/main/resources/META-INF/botania_at.cfg') runs { client = { diff --git a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java index 88ed304f1..6f2afd80f 100644 --- a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java @@ -14,9 +14,12 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.Entity; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.registry.IRegistry; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; +import net.minecraft.world.dimension.DimensionType; import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; @@ -24,6 +27,7 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.api.distmarker.Dist; import org.lwjgl.opengl.ARBFragmentShader; +import org.lwjgl.opengl.ARBVertexShader; import org.lwjgl.opengl.GL; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL20; @@ -57,11 +61,13 @@ public final class DebugHandler { event.getLeft().add(PREFIX + "(CLIENT) netColl: " + ManaNetworkHandler.instance.getAllCollectorsInWorld(world).size() + ", netPool: " + ManaNetworkHandler.instance.getAllPoolsInWorld(world).size() + ", rv: " + version); if (Minecraft.getInstance().isSingleplayer()) { + DimensionType dim = Minecraft.getInstance().world.getDimension().getType(); + ResourceLocation dimName = IRegistry.DIMENSION_TYPE.getKey(dim); UUID id = Minecraft.getInstance().player.getUniqueID(); - Entity ent = Minecraft.getInstance().getIntegratedServer().getEntityFromUuid(id); + Entity ent = Minecraft.getInstance().getIntegratedServer().getWorld(dim).getEntityFromUuid(id); if (ent != null) { World serverWorld = ent.world; - event.getLeft().add(PREFIX + String.format("(INTEGRATED SERVER DIM %d) netColl : %d, netPool: %d", serverWorld.provider.getDimension(), ManaNetworkHandler.instance.getAllCollectorsInWorld(serverWorld).size(), ManaNetworkHandler.instance.getAllPoolsInWorld(serverWorld).size())); + event.getLeft().add(PREFIX + String.format("(INTEGRATED SERVER DIM %d) netColl : %d, netPool: %d", dimName, ManaNetworkHandler.instance.getAllCollectorsInWorld(serverWorld).size(), ManaNetworkHandler.instance.getAllPoolsInWorld(serverWorld).size())); } } @@ -75,7 +81,7 @@ public final class DebugHandler { event.getLeft().add(" GL_VERSION: " + GL11.glGetString(GL11.GL_VERSION)); event.getLeft().add(" GL_RENDERER: " + GL11.glGetString(GL11.GL_RENDERER)); event.getLeft().add(" GL_SHADING_LANGUAGE_VERSION: " + GL11.glGetString(GL20.GL_SHADING_LANGUAGE_VERSION)); - event.getLeft().add(" GL_MAX_TEXTURE_IMAGE_UNITS_ARB: " + GL11.glGetInteger(GL20.GL_MAX_TEXTURE_IMAGE_UNITS_ARB)); + event.getLeft().add(" GL_MAX_TEXTURE_IMAGE_UNITS_ARB: " + GL11.glGetInteger(ARBVertexShader.GL_MAX_TEXTURE_IMAGE_UNITS_ARB)); event.getLeft().add(" GL_ARB_multitexture: " + caps.GL_ARB_multitexture); event.getLeft().add(" GL_ARB_texture_non_power_of_two: " + caps.GL_ARB_texture_non_power_of_two); event.getLeft().add(" OpenGL13: " + caps.OpenGL13); diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index abf12b978..c490b6239 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -89,7 +89,6 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.core.proxy.IProxy; -import vazkii.botania.common.core.version.AdaptorNotifier; import vazkii.botania.common.entity.EntityBabylonWeapon; import vazkii.botania.common.entity.EntityCorporeaSpark; import vazkii.botania.common.entity.EntityDoppleganger; diff --git a/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java b/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java index b536a2720..f5e14dff7 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java @@ -10,6 +10,7 @@ */ package vazkii.botania.client.gui.bag; +import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -17,6 +18,7 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraftforge.items.SlotItemHandler; import vazkii.botania.client.gui.SlotLocked; +import vazkii.botania.common.block.BlockModFlower; import javax.annotation.Nonnull; @@ -68,7 +70,8 @@ public class ContainerFlowerBag extends Container { if(!mergeItemStack(itemstack1, 16, 52, true)) return ItemStack.EMPTY; } else { - int i = itemstack.getItemDamage(); + Block b = Block.getBlockFromItem(itemstack.getItem()); + int i = b instanceof BlockModFlower ? ((BlockModFlower) b).color.getId() : -1; if(i < 16) { Slot slot1 = inventorySlots.get(i); if(slot1.isItemValid(itemstack) && !mergeItemStack(itemstack1, i, i + 1, true)) diff --git a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java index 515a35a86..166974863 100644 --- a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java @@ -40,6 +40,7 @@ import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.decor.BlockFloatingFlower; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibMisc; @@ -87,7 +88,7 @@ public class FloatingFlowerModel implements IBakedModel { @Nonnull @Override public List getQuads(IBlockState state, EnumFacing face, @Nonnull Random rand) { - if(state.getBlock() != ModBlocks.floatingSpecialFlower && state.getBlock() != ModBlocks.floatingFlower) + if(state.getBlock() != ModBlocks.floatingSpecialFlower && !(state.getBlock() instanceof BlockFloatingFlower)) return Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel().getQuads(state, face, rand); IExtendedBlockState realState = (IExtendedBlockState) state; IFloatingFlower.IslandType islandType = realState.getValue(BotaniaStateProps.ISLAND_TYPE); @@ -98,7 +99,7 @@ public class FloatingFlowerModel implements IBakedModel { identifier = realState.getValue(BotaniaStateProps.SUBTILE_ID); } else { // Mundane flower - identifier = new ResourceLocation(LibMisc.MOD_ID, MUNDANE_PREFIX + state.get(BotaniaStateProps.COLOR)); + identifier = state.getBlock().getRegistryName(); } return getModel(islandType, identifier).getQuads(state, face, rand); @@ -111,7 +112,7 @@ public class FloatingFlowerModel implements IBakedModel { if(islandType == null) // This and the next one can be null if obtained from a non-extended state islandType = IFloatingFlower.IslandType.GRASS; if(identifier == null) - identifier = ""; + identifier = ModBlocks.whiteFloatingFlower.getRegistryName(); if(CACHE.contains(islandType, identifier)) { return CACHE.get(islandType, identifier); diff --git a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java index 6a8477dd0..8b2aeaf4b 100644 --- a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java @@ -13,19 +13,19 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.block.model.BakedQuad; -import net.minecraft.client.renderer.block.model.IBakedModel; -import net.minecraft.client.renderer.block.model.IUnbakedModel; -import net.minecraft.client.renderer.block.model.ItemCameraTransforms; -import net.minecraft.client.renderer.block.model.ItemOverrideList; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.client.renderer.model.BakedQuad; +import net.minecraft.client.renderer.model.IBakedModel; +import net.minecraft.client.renderer.model.IUnbakedModel; +import net.minecraft.client.renderer.model.ItemCameraTransforms; +import net.minecraft.client.renderer.model.ItemOverrideList; +import net.minecraft.client.renderer.model.ModelResourceLocation; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.renderer.vertex.VertexFormat; -import net.minecraft.client.resources.IResourceManager; import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import net.minecraft.resources.IResourceManager; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; @@ -49,6 +49,8 @@ import javax.vecmath.Matrix4f; import java.util.Collection; import java.util.List; import java.util.Map; +import java.util.Random; +import java.util.Set; import java.util.function.Function; public class SpecialFlowerModel implements IUnbakedModel { @@ -80,30 +82,30 @@ public class SpecialFlowerModel implements IUnbakedModel { } @Override - public Collection getTextures() { + public Collection getTextures(Function modelGetter, Set errors) { return ImmutableList.of(); } @Override - public IBakedModel bake(IModelState state, VertexFormat format, Function bakedTextureGetter) { + public IBakedModel bake(Function modelGetter, Function spriteGetter, IModelState state, boolean uvlock, VertexFormat format) { ImmutableMap transforms = PerspectiveMapWrapper.getTransforms(state); IModelState transformState = new SimpleModelState(transforms); IBakedModel baseModelBaked = ModelLoaderRegistry.getModelOrMissing(baseModel) - .bake(transformState, DefaultVertexFormats.ITEM, ModelLoader.defaultTextureGetter()); + .bake(modelGetter, spriteGetter, state, uvlock, format); ImmutableMap.Builder bakedBlockBuilder = ImmutableMap.builder(); for(Map.Entry e : blockModels.entrySet()) { IModel model = ModelLoaderRegistry.getModelOrMissing(e.getValue()); if(model != ModelLoaderRegistry.getMissingModel()) - bakedBlockBuilder.put(e.getKey(), model.bake(transformState, DefaultVertexFormats.ITEM, ModelLoader.defaultTextureGetter())); + bakedBlockBuilder.put(e.getKey(), model.bake(modelGetter, spriteGetter, state, uvlock, format)); } ImmutableMap.Builder bakedItemBuilder = ImmutableMap.builder(); for(Map.Entry e : itemModels.entrySet()) { IModel model = ModelLoaderRegistry.getModelOrMissing(e.getValue()); if(model != ModelLoaderRegistry.getMissingModel()) - bakedItemBuilder.put(e.getKey(), model.bake(transformState, DefaultVertexFormats.ITEM, ModelLoader.defaultTextureGetter())); + bakedItemBuilder.put(e.getKey(), model.bake(modelGetter, spriteGetter, state, uvlock, format)); } return new SpecialFlowerBakedModel(baseModelBaked, bakedBlockBuilder.build(), bakedItemBuilder.build(), transforms); @@ -115,7 +117,7 @@ public class SpecialFlowerModel implements IUnbakedModel { } @Override - public IModel process(ImmutableMap customData) { + public IUnbakedModel process(ImmutableMap customData) { // Load the base variant from blockstate json, and also add all the model paths we received from external API ModelResourceLocation base = baseModel; @@ -143,7 +145,7 @@ public class SpecialFlowerModel implements IUnbakedModel { } @Override - public IModel loadModel(ResourceLocation modelLocation) { + public IUnbakedModel loadModel(ResourceLocation modelLocation) { // Load a dummy model for now, all actual blockModels added in process(). return new SpecialFlowerModel(new ModelResourceLocation("builtin/missing", "missing"), ImmutableMap.of(), ImmutableMap.of()); } @@ -168,7 +170,7 @@ public class SpecialFlowerModel implements IUnbakedModel { @Nonnull @Override - public List getQuads(IBlockState state, EnumFacing face, long rand) { + public List getQuads(IBlockState state, EnumFacing face, Random rand) { IExtendedBlockState extendedState = (IExtendedBlockState) state; ResourceLocation subtileId = extendedState.getValue(BotaniaStateProps.SUBTILE_ID); @@ -185,12 +187,12 @@ public class SpecialFlowerModel implements IUnbakedModel { return itemHandler; } - private final ItemStack roseFallback = new ItemStack(Blocks.RED_FLOWER); + private final ItemStack roseFallback = new ItemStack(Blocks.POPPY); - private final ItemOverrideList itemHandler = new ItemOverrideList(ImmutableList.of()) { + private final ItemOverrideList itemHandler = new ItemOverrideList() { @Nonnull @Override - public IBakedModel handleItemState(@Nonnull IBakedModel original, ItemStack stack, World world, EntityLivingBase living) { + public IBakedModel getModelWithOverrides(@Nonnull IBakedModel original, ItemStack stack, World world, EntityLivingBase living) { IBakedModel model = bakedItemModels.get(ItemBlockSpecialFlower.getType(stack)); if(model == null) diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index e3a4e738d..2e3c834b3 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -555,7 +555,7 @@ public final class ModBlocks { register(r, new BlockModDoubleFlower(color, builder), color.getName() + LibBlockNames.DOUBLE_FLOWER_SUFFIX); } - register(r, new BlockFakeAir(Block.Properties.create(Material.STRUCTURE_VOID).needsRandomTick()), LibBlockNames.FAKE_AIR); + register(r, new BlockFakeAir(Block.Properties.create(Material.STRUCTURE_VOID).tickRandomly()), LibBlockNames.FAKE_AIR); register(r, new BlockModLexiconable(Block.Properties.create(Material.IRON).hardnessAndResistance(3, 10).sound(SoundType.METAL).lightValue(15), (w, po, pl, st) -> LexiconData.blazeBlock), LibBlockNames.BLAZE_BLOCK); register(r, new BlockCorporeaInterceptor(Block.Properties.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL)), LibBlockNames.CORPOREA_INTERCEPTOR); register(r, new BlockCorporeaCrystalCube(Block.Properties.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL)), LibBlockNames.CORPOREA_CRYSTAL_CUBE); @@ -588,7 +588,7 @@ public final class ModBlocks { register(r, new BlockModLexiconable(Block.Properties.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD), rainbowRod), LibBlockNames.SHIMMERWOOD_PLANKS); register(r, new BlockAvatar(Block.Properties.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD)), LibBlockNames.AVATAR); - builder = Block.Properties.create(Material.GRASS).hardnessAndResistance(0.6F).needsRandomTick().sound(SoundType.PLANT); + builder = Block.Properties.create(Material.GRASS).hardnessAndResistance(0.6F).tickRandomly().sound(SoundType.PLANT); for(BlockAltGrass.Variant v : BlockAltGrass.Variant.values()) { register(r, new BlockAltGrass(v, builder), v.name().toLowerCase(Locale.ROOT) + LibBlockNames.ALT_GRASS_SUFFIX); } diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java index 03f06699d..930bc4afa 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java @@ -12,40 +12,31 @@ package vazkii.botania.common.block.corporea; import net.minecraft.block.Block; import javax.annotation.Nonnull; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; + import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockReader; +import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; -import net.minecraftforge.client.ForgeHooksClient; -import net.minecraftforge.common.property.IUnlistedProperty; -import net.minecraftforge.common.property.Properties; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.wand.IWandable; -import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.tile.corporea.TileCorporeaBase; import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; -import vazkii.botania.common.lib.LibBlockNames; public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexiconable, IWandable { - private static final AxisAlignedBB AABB = new AxisAlignedBB(3.0/16, 0, 3.0/16, 13.0/16, 1, 13.0/16); + private static final VoxelShape SHAPE = makeCuboidShape(3.0, 0, 3.0, 13.0, 16, 13.0); public BlockCorporeaCrystalCube(Block.Properties builder) { super(builder); @@ -61,8 +52,8 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi @Nonnull @Override - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockReader world, BlockPos pos) { - return AABB; + public VoxelShape getShape(IBlockState state, IBlockReader world, BlockPos pos) { + return SHAPE; } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java index 477805ef4..1215125d8 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java @@ -19,6 +19,7 @@ import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AlfPortalState; import vazkii.botania.common.Botania; +import vazkii.botania.common.block.BlockModFlower; import vazkii.botania.common.block.BlockPylon; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.mana.BlockPool; @@ -81,8 +82,8 @@ public class TilePylon extends TileEntity implements ITickable { Vector3 movementVector = centerBlock.subtract(ourCoords).normalize().multiply(0.2); Block block = world.getBlockState(pos.down()).getBlock(); - if(block == ModBlocks.flower || block == ModBlocks.shinyFlower) { - int hex = world.getBlockState(pos.down()).get(BotaniaStateProps.COLOR).colorValue; + if(block instanceof BlockModFlower) { + int hex = ((BlockModFlower) block).color.colorValue; int r = (hex & 0xFF0000) >> 16; int g = (hex & 0xFF00) >> 8; int b = hex & 0xFF; diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 4d8123665..278588f0e 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -329,10 +329,6 @@ public final class ModCraftingRecipes { r.register(new SpecialFloatingFlowerRecipe(s).setRegistryName(new ResourceLocation(LibMisc.MOD_ID, "floating_" + s.toString().replaceAll(":", "_")))); } - for(int i = 0; i < 8; i++) { - GameRegistry.addSmelting(new ItemStack(ModFluffBlocks.biomeStoneA, 1, i + 8), new ItemStack(ModFluffBlocks.biomeStoneA, 1, i), 0.1F); - } - // Terrasteel Armor Recipes r.register(new ArmorUpgradeRecipe(new ItemStack(ModItems.terrasteelHelmRevealing), "TRT", "SAS", " S ", diff --git a/src/main/java/vazkii/botania/common/crafting/ModManaConjurationRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModManaConjurationRecipes.java index 022cc9d64..7faaa2301 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaConjurationRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaConjurationRecipes.java @@ -14,6 +14,8 @@ import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.IItemProvider; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.recipe.RecipeManaInfusion; @@ -34,24 +36,28 @@ public class ModManaConjurationRecipes { public static RecipeManaInfusion grassRecipe; public static void init() { - redstoneRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Items.REDSTONE, 2), new ItemStack(Items.REDSTONE), 5000); - glowstoneRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Items.GLOWSTONE_DUST, 2), new ItemStack(Items.GLOWSTONE_DUST), 5000); - quartzRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Items.QUARTZ, 2), new ItemStack(Items.QUARTZ), 2500); - coalRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Items.COAL, 2), new ItemStack(Items.COAL), 2100); - snowballRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Items.SNOWBALL, 2), new ItemStack(Items.SNOWBALL), 200); - netherrackRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Blocks.NETHERRACK, 2), new ItemStack(Blocks.NETHERRACK), 200); - soulSandRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Blocks.SOUL_SAND, 2), new ItemStack(Blocks.SOUL_SAND), 1500); - gravelRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Blocks.GRAVEL, 2), new ItemStack(Blocks.GRAVEL), 720); + redstoneRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Items.REDSTONE, 2), ingr(Items.REDSTONE), 5000); + glowstoneRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Items.GLOWSTONE_DUST, 2), ingr(Items.GLOWSTONE_DUST), 5000); + quartzRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Items.QUARTZ, 2), ingr(Items.QUARTZ), 2500); + coalRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Items.COAL, 2), ingr(Items.COAL), 2100); + snowballRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Items.SNOWBALL, 2), ingr(Items.SNOWBALL), 200); + netherrackRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Blocks.NETHERRACK, 2), ingr(Blocks.NETHERRACK), 200); + soulSandRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Blocks.SOUL_SAND, 2), ingr(Blocks.SOUL_SAND), 1500); + gravelRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Blocks.GRAVEL, 2), ingr(Blocks.GRAVEL), 720); leavesRecipes = new ArrayList<>(); - leavesRecipes.add(BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Blocks.OAK_LEAVES, 2), new ItemStack(Blocks.OAK_LEAVES), 2000)); - leavesRecipes.add(BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Blocks.BIRCH_LEAVES, 2), new ItemStack(Blocks.BIRCH_LEAVES), 2000)); - leavesRecipes.add(BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Blocks.SPRUCE_LEAVES, 2), new ItemStack(Blocks.SPRUCE_LEAVES), 2000)); - leavesRecipes.add(BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Blocks.JUNGLE_LEAVES, 2), new ItemStack(Blocks.JUNGLE_LEAVES), 2000)); - leavesRecipes.add(BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Blocks.ACACIA_LEAVES, 2), new ItemStack(Blocks.ACACIA_LEAVES), 2000)); - leavesRecipes.add(BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Blocks.DARK_OAK_LEAVES, 2), new ItemStack(Blocks.DARK_OAK_LEAVES), 2000)); + leavesRecipes.add(BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Blocks.OAK_LEAVES, 2), ingr(Blocks.OAK_LEAVES), 2000)); + leavesRecipes.add(BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Blocks.BIRCH_LEAVES, 2), ingr(Blocks.BIRCH_LEAVES), 2000)); + leavesRecipes.add(BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Blocks.SPRUCE_LEAVES, 2), ingr(Blocks.SPRUCE_LEAVES), 2000)); + leavesRecipes.add(BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Blocks.JUNGLE_LEAVES, 2), ingr(Blocks.JUNGLE_LEAVES), 2000)); + leavesRecipes.add(BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Blocks.ACACIA_LEAVES, 2), ingr(Blocks.ACACIA_LEAVES), 2000)); + leavesRecipes.add(BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Blocks.DARK_OAK_LEAVES, 2), ingr(Blocks.DARK_OAK_LEAVES), 2000)); - grassRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Blocks.GRASS), new ItemStack(Blocks.GRASS), 800); + grassRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Blocks.GRASS), ingr(Blocks.GRASS), 800); + } + + private static Ingredient ingr(IItemProvider i) { + return Ingredient.fromItems(i); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java index ac7c297f4..aa32691d1 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java @@ -11,6 +11,7 @@ package vazkii.botania.common.crafting.recipe; import com.google.gson.JsonObject; +import net.minecraft.block.Block; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; @@ -24,6 +25,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.registries.IForgeRegistryEntry; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.decor.BlockFloatingFlower; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibMisc; @@ -46,7 +48,7 @@ public class SpecialFloatingFlowerRecipe extends IRecipeHidden { for(int i = 0; i < inv.getSizeInventory(); i++) { ItemStack stack = inv.getStackInSlot(i); if(!stack.isEmpty()) { - if(stack.getItem() == ModBlocks.floatingFlower.asItem()) + if(Block.getBlockFromItem(stack.getItem()) instanceof BlockFloatingFlower) foundFloatingFlower = true; else if(stack.getItem() == ModBlocks.specialFlower.asItem() && ItemBlockSpecialFlower.getType(stack).equals(flowerType)) diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 704273ff2..e2c0ad6ad 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -147,7 +147,7 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss, IE private boolean hardMode = false; private BlockPos source = BlockPos.ORIGIN; private final List playersWhoAttacked = new ArrayList<>(); - private final BossInfoServer bossInfo = (BossInfoServer) new BossInfoServer(TYPE.func_212546_e(), BossInfo.Color.PINK, BossInfo.Overlay.PROGRESS).setCreateFog(true);; + private final BossInfoServer bossInfo = (BossInfoServer) new BossInfoServer(TYPE.getName(), BossInfo.Color.PINK, BossInfo.Overlay.PROGRESS).setCreateFog(true);; private UUID bossInfoUUID = bossInfo.getUniqueId(); public EntityPlayer trueKiller = null; diff --git a/src/main/java/vazkii/botania/common/item/ItemElven.java b/src/main/java/vazkii/botania/common/item/ItemElven.java index 14d3d2e85..14430b84b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemElven.java +++ b/src/main/java/vazkii/botania/common/item/ItemElven.java @@ -14,8 +14,8 @@ import net.minecraft.item.ItemStack; import vazkii.botania.api.recipe.IElvenItem; public class ItemElven extends ItemMod implements IElvenItem { - public ItemElven(String name) { - super(name); + public ItemElven(Properties props) { + super(props); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index cfee8236c..da6813170 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -14,14 +14,12 @@ import net.minecraft.init.Items; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; -import net.minecraft.item.ItemRecord; import net.minecraft.item.ItemStack; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.registries.IForgeRegistry; -import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.api.mana.spark.SparkUpgradeType; import vazkii.botania.api.item.IAncientWillContainer; @@ -69,7 +67,7 @@ import vazkii.botania.common.item.lens.*; import vazkii.botania.common.item.material.ItemDye; import vazkii.botania.common.item.material.ItemEnderAir; import vazkii.botania.common.item.material.ItemManaResource; -import vazkii.botania.common.item.material.ItemPestleAndMortar; +import vazkii.botania.common.item.material.ItemSelfReturning; import vazkii.botania.common.item.material.ItemPetal; import vazkii.botania.common.item.material.ItemRune; import vazkii.botania.common.item.record.ItemModRecord; @@ -98,7 +96,6 @@ import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.lib.LibOreDict; import java.util.*; -import java.util.stream.Collectors; @Mod.EventBusSubscriber(modid = LibMisc.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) public final class ModItems { @@ -112,32 +109,32 @@ public final class ModItems { } } - public static final Item pestleAndMortar = new ItemPestleAndMortar(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.PESTLE_AND_MORTAR); + public static final Item pestleAndMortar = new ItemSelfReturning(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.PESTLE_AND_MORTAR); public static final Item twigWand = new ItemTwigWand(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.TWIG_WAND); - public static final Item manaSteel = new ItemManaResource(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[0]); - public static final Item manaPearl = new ItemManaResource(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[1]); - public static final Item manaDiamond = new ItemManaResource(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[2]); - public static final Item livingwoodTwig = new ItemManaResource(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[3]); + public static final Item manaSteel = new ItemMod(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[0]); + public static final Item manaPearl = new ItemMod(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[1]); + public static final Item manaDiamond = new ItemMod(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[2]); + public static final Item livingwoodTwig = new ItemMod(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[3]); public static final Item terrasteel = new ItemManaResource(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[4]); - public static final Item lifeEssence = new ItemManaResource(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[5]); - public static final Item redstoneRoot = new ItemManaResource(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[6]); - public static final Item elementium = new ItemManaResource(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[7]); - public static final Item pixieDust = new ItemManaResource(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[8]); - public static final Item dragonstone = new ItemManaResource(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[9]); - public static final Item placeholder = new ItemManaResource(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[11]); - public static final Item redString = new ItemManaResource(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[12]); - public static final Item dreamwoodTwig = new ItemManaResource(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[13]); + public static final Item lifeEssence = new ItemMod(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[5]); + public static final Item redstoneRoot = new ItemMod(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[6]); + public static final Item elementium = new ItemElven(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[7]); + public static final Item pixieDust = new ItemElven(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[8]); + public static final Item dragonstone = new ItemElven(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[9]); + public static final Item placeholder = new ItemSelfReturning(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[11]); + public static final Item redString = new ItemMod(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[12]); + public static final Item dreamwoodTwig = new ItemMod(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[13]); public static final Item gaiaIngot = new ItemManaResource(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[14]); public static final Item enderAirBottle = new ItemEnderAir(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[15]); - public static final Item manaString = new ItemManaResource(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[16]); - public static final Item manasteelNugget = new ItemManaResource(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[17]); - public static final Item terrasteelNugget = new ItemManaResource(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[18]); - public static final Item elementiumNugget = new ItemManaResource(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[19]); + public static final Item manaString = new ItemMod(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[16]); + public static final Item manasteelNugget = new ItemMod(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[17]); + public static final Item terrasteelNugget = new ItemMod(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[18]); + public static final Item elementiumNugget = new ItemMod(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[19]); public static final Item livingroot = new ItemManaResource(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[20]); - public static final Item pebble = new ItemManaResource(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[21]); - public static final Item manaweaveCloth = new ItemManaResource(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[22]); - public static final Item manaPowder = new ItemManaResource(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[23]); + public static final Item pebble = new ItemMod(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[21]); + public static final Item manaweaveCloth = new ItemMod(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[22]); + public static final Item manaPowder = new ItemMod(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[23]); public static final Item lensNormal = new ItemLens(unstackable(), new Lens(), ItemLens.PROP_NONE).setRegistryName(LibMisc.MOD_ID, LibItemNames.LENS_NAMES[0]); public static final Item lensSpeed = new ItemLens(unstackable(), new LensSpeed(), ItemLens.PROP_NONE).setRegistryName(LibMisc.MOD_ID, LibItemNames.LENS_NAMES[1]); diff --git a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java index 1d726e9c1..31cec2816 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -10,58 +10,32 @@ */ package vazkii.botania.common.item.material; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemUseContext; import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import vazkii.botania.api.recipe.IElvenItem; -import vazkii.botania.api.recipe.ICustomApothecaryColor; import vazkii.botania.common.entity.EntityDoppleganger; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.item.ModItems; import javax.annotation.Nonnull; -// todo 1.13 further break this up -public class ItemManaResource extends ItemMod implements ICustomApothecaryColor, IElvenItem { +public class ItemManaResource extends ItemMod { public ItemManaResource(Properties props) { super(props); } @Nonnull @Override - public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { - ItemStack stack = player.getHeldItem(hand); + public EnumActionResult onItemUse(ItemUseContext ctx) { + ItemStack stack = ctx.getItem(); if(this == ModItems.terrasteel || this == ModItems.gaiaIngot) - return EntityDoppleganger.spawn(player, stack, world, pos, this == ModItems.gaiaIngot) ? EnumActionResult.SUCCESS : EnumActionResult.FAIL; - else if(this == ModItems.livingroot && net.minecraft.item.ItemDye.applyBonemeal(stack, world, pos, player, hand)) { - if(!world.isRemote) - world.playEvent(2005, pos, 0); - - return EnumActionResult.SUCCESS; + return EntityDoppleganger.spawn(ctx.getPlayer(), stack, ctx.getWorld(), ctx.getPos(), this == ModItems.gaiaIngot) ? EnumActionResult.SUCCESS : EnumActionResult.FAIL; + else if(this == ModItems.livingroot) { + return Items.BONE_MEAL.onItemUse(ctx); } - return super.onItemUse(player, world, pos, hand, side, par8, par9, par10); + return super.onItemUse(ctx); } - - @Override - public int getParticleColor(ItemStack stack) { - return 0x9b0000; - } - - @Override - public boolean isElvenItem(ItemStack stack) { - return this == ModItems.elementium || this == ModItems.pixieDust || this == ModItems.dragonstone; - } - - @Nonnull - @Override - public ItemStack getContainerItem(@Nonnull ItemStack itemStack) { - return this == ModItems.placeholder ? itemStack.copy() : ItemStack.EMPTY; - } - } diff --git a/src/main/java/vazkii/botania/common/item/material/ItemPestleAndMortar.java b/src/main/java/vazkii/botania/common/item/material/ItemSelfReturning.java similarity index 87% rename from src/main/java/vazkii/botania/common/item/material/ItemPestleAndMortar.java rename to src/main/java/vazkii/botania/common/item/material/ItemSelfReturning.java index d4080da04..01c82e388 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemPestleAndMortar.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemSelfReturning.java @@ -15,9 +15,9 @@ import net.minecraft.item.ItemStack; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; -public class ItemPestleAndMortar extends ItemMod { +public class ItemSelfReturning extends ItemMod { - public ItemPestleAndMortar(Item.Properties builder) { + public ItemSelfReturning(Item.Properties builder) { super(builder); } diff --git a/src/main/resources/META-INF/botania_at.cfg b/src/main/resources/META-INF/botania_at.cfg index 6ff183b85..c2aa84a4a 100644 --- a/src/main/resources/META-INF/botania_at.cfg +++ b/src/main/resources/META-INF/botania_at.cfg @@ -2,10 +2,10 @@ public net.minecraft.client.renderer.entity.RenderManager field_78725_b # render public net.minecraft.client.renderer.entity.RenderManager field_78726_c # renderPosY public net.minecraft.client.renderer.entity.RenderManager field_78723_d # renderPosZ -public net.minecraft.client.renderer.RenderGlobal field_72772_v # starGLCallList -public net.minecraft.client.renderer.RenderGlobal field_175013_s # starVBO -public net.minecraft.client.renderer.RenderGlobal field_72771_w # glSkyList -public net.minecraft.client.renderer.RenderGlobal field_175012_t # skyVBO +public net.minecraft.client.renderer.WorldRenderer field_72772_v # starGLCallList +public net.minecraft.client.renderer.WorldRenderer field_175013_s # starVBO +public net.minecraft.client.renderer.WorldRenderer field_72771_w # glSkyList +public net.minecraft.client.renderer.WorldRenderer field_175012_t # skyVBO public net.minecraft.entity.item.EntityItem field_70292_b # age public net.minecraft.entity.item.EntityItem field_145804_b # delayBeforeCanPickup @@ -43,8 +43,6 @@ public net.minecraft.client.gui.GuiChat field_146415_a # inputField public net.minecraft.advancements.CriteriaTriggers func_192118_a(Lnet/minecraft/advancements/ICriterionTrigger;)Lnet/minecraft/advancements/ICriterionTrigger; # register -public net.minecraft.item.ItemTool field_77862_b # toolMaterial - public net.minecraft.client.multiplayer.ClientAdvancementManager field_192803_d # advancementToProgress public net.minecraft.item.EnumDyeColor field_193351_w # colorValue diff --git a/src/main/resources/data/botania/recipes/smelting/metamoprhic_mountain_stone.json b/src/main/resources/data/botania/recipes/smelting/metamoprhic_mountain_stone.json new file mode 100644 index 000000000..d87b33413 --- /dev/null +++ b/src/main/resources/data/botania/recipes/smelting/metamoprhic_mountain_stone.json @@ -0,0 +1,9 @@ +{ + "type": "smelting", + "ingredient": { + "item": "botania:metamorphic_mountain_cobblestone" + }, + "result": "botania:metamorphic_mountain_stone", + "experience": 0.1, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/smelting/metamoprhic_plains_stone.json b/src/main/resources/data/botania/recipes/smelting/metamoprhic_plains_stone.json new file mode 100644 index 000000000..a1d194c13 --- /dev/null +++ b/src/main/resources/data/botania/recipes/smelting/metamoprhic_plains_stone.json @@ -0,0 +1,9 @@ +{ + "type": "smelting", + "ingredient": { + "item": "botania:metamorphic_plains_cobblestone" + }, + "result": "botania:metamorphic_plains_stone", + "experience": 0.1, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/smelting/metamorphic_desert_stone.json b/src/main/resources/data/botania/recipes/smelting/metamorphic_desert_stone.json new file mode 100644 index 000000000..e615e1687 --- /dev/null +++ b/src/main/resources/data/botania/recipes/smelting/metamorphic_desert_stone.json @@ -0,0 +1,9 @@ +{ + "type": "smelting", + "ingredient": { + "item": "botania:metamorphic_desert_cobblestone" + }, + "result": "botania:metamorphic_desert_stone", + "experience": 0.1, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/smelting/metamorphic_forest_stone.json b/src/main/resources/data/botania/recipes/smelting/metamorphic_forest_stone.json new file mode 100644 index 000000000..f430b9d92 --- /dev/null +++ b/src/main/resources/data/botania/recipes/smelting/metamorphic_forest_stone.json @@ -0,0 +1,9 @@ +{ + "type": "smelting", + "ingredient": { + "item": "botania:metamorphic_forest_cobblestone" + }, + "result": "botania:metamorphic_forest_stone", + "experience": 0.1, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/smelting/metamorphic_fungal_stone.json b/src/main/resources/data/botania/recipes/smelting/metamorphic_fungal_stone.json new file mode 100644 index 000000000..2c0426a0d --- /dev/null +++ b/src/main/resources/data/botania/recipes/smelting/metamorphic_fungal_stone.json @@ -0,0 +1,9 @@ +{ + "type": "smelting", + "ingredient": { + "item": "botania:metamorphic_fungal_cobblestone" + }, + "result": "botania:metamorphic_fungal_stone", + "experience": 0.1, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/smelting/metamorphic_mesa_stone.json b/src/main/resources/data/botania/recipes/smelting/metamorphic_mesa_stone.json new file mode 100644 index 000000000..38cda7b50 --- /dev/null +++ b/src/main/resources/data/botania/recipes/smelting/metamorphic_mesa_stone.json @@ -0,0 +1,9 @@ +{ + "type": "smelting", + "ingredient": { + "item": "botania:metamorphic_mesa_cobblestone" + }, + "result": "botania:metamorphic_mesa_stone", + "experience": 0.1, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/smelting/metamorphic_swamp_stone.json b/src/main/resources/data/botania/recipes/smelting/metamorphic_swamp_stone.json new file mode 100644 index 000000000..dea54475c --- /dev/null +++ b/src/main/resources/data/botania/recipes/smelting/metamorphic_swamp_stone.json @@ -0,0 +1,9 @@ +{ + "type": "smelting", + "ingredient": { + "item": "botania:metamorphic_swamp_cobblestone" + }, + "result": "botania:metamorphic_swamp_stone", + "experience": 0.1, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/smelting/metamorphic_taiga_stone.json b/src/main/resources/data/botania/recipes/smelting/metamorphic_taiga_stone.json new file mode 100644 index 000000000..3c2c21f84 --- /dev/null +++ b/src/main/resources/data/botania/recipes/smelting/metamorphic_taiga_stone.json @@ -0,0 +1,9 @@ +{ + "type": "smelting", + "ingredient": { + "item": "botania:metamorphic_taiga_cobblestone" + }, + "result": "botania:metamorphic_taiga_stone", + "experience": 0.1, + "cookingtime": 200 +} \ No newline at end of file