From 3e79893a359511f0372593e011a935bb6ea40c7c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 23 Mar 2016 21:34:19 -0500 Subject: [PATCH] Barely runs --- build.properties | 2 +- .../botania/api/state/BotaniaStateProps.java | 8 +++--- .../client/core/handler/ModelHandler.java | 28 +++++++++---------- .../client/core/proxy/ClientProxy.java | 20 +++++-------- .../client/model/FloatingFlowerModel.java | 2 +- .../botania/client/model/ModelPylon.java | 2 +- .../botania/client/model/PylonItemModel.java | 4 +-- .../client/model/SpecialFlowerModel.java | 4 +-- .../tile/RenderTileCorporeaCrystalCube.java | 8 ++++-- .../block/decor/slabs/BlockModSlab.java | 3 +- .../corporea/TileCorporeaCrystalCube.java | 13 ++++----- .../common/block/tile/mana/TilePump.java | 23 ++++++++------- .../equipment/tool/bow/ItemLivingwoodBow.java | 6 ++-- .../tool/manasteel/ItemManasteelAxe.java | 13 +++++++-- 14 files changed, 71 insertions(+), 65 deletions(-) diff --git a/build.properties b/build.properties index 518e2b4a1..d2ba7e27e 100644 --- a/build.properties +++ b/build.properties @@ -2,7 +2,7 @@ #Sat Mar 12 17:00:04 CST 2016 version=r1.8 dir_output=../Build Output/Botania/ -forge_version=12.16.0.1767-1.9 +forge_version=12.16.0.1797-1.9 mc_version=1.9 dir_repo=./ build_number=300 diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index 7e5d9c2ae..1324e9c7d 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -76,7 +76,7 @@ public final class BotaniaStateProps { public static final PropertyEnum FUTURESTONE_VARIANT = PropertyEnum.create("variant", FutureStoneVariant.class); // Block18StoneWall - public static final PropertyEnum FUTURESTONEWALL_VARIANT = PropertyEnum.create("variant", FutureStoneVariant.class, new Predicate() { + public static final PropertyEnum FUTURESTONEWALL_VARIANT = PropertyEnum.create("fswall_variant", FutureStoneVariant.class, new Predicate() { @Override public boolean apply(FutureStoneVariant variant) { // Just the four kinds (no polished, chiseled, etc.) @@ -100,7 +100,7 @@ public final class BotaniaStateProps { public static final PropertyEnum BIOMEBRICK_VARIANT = PropertyEnum.create("variant", BiomeBrickVariant.class); // BlockBiomeStoneWall - public static final PropertyEnum BIOMESTONEWALL_VARIANT = PropertyEnum.create("variant", BiomeStoneVariant.class, new Predicate() { + public static final PropertyEnum BIOMESTONEWALL_VARIANT = PropertyEnum.create("bswall_variant", BiomeStoneVariant.class, new Predicate() { @Override public boolean apply(BiomeStoneVariant input) { return input.getName().contains("cobble"); @@ -132,7 +132,7 @@ public final class BotaniaStateProps { public static final PropertyEnum LIVINGROCK_VARIANT = PropertyEnum.create("variant", LivingRockVariant.class); // BlockModDoubleFlower (white to gray) - public static final PropertyEnum DOUBLEFLOWER_VARIANT_1 = PropertyEnum.create("variant", EnumDyeColor.class, new Predicate() { + public static final PropertyEnum DOUBLEFLOWER_VARIANT_1 = PropertyEnum.create("df_variant", EnumDyeColor.class, new Predicate() { @Override public boolean apply(EnumDyeColor input) { return input.ordinal() >= 0 && input.ordinal() <= 7; @@ -140,7 +140,7 @@ public final class BotaniaStateProps { }); // (silver to black) - public static final PropertyEnum DOUBLEFLOWER_VARIANT_2 = PropertyEnum.create("variant", EnumDyeColor.class, new Predicate() { + public static final PropertyEnum DOUBLEFLOWER_VARIANT_2 = PropertyEnum.create("df_variant", EnumDyeColor.class, new Predicate() { @Override public boolean apply(EnumDyeColor input) { return input.ordinal() >= 8 && input.ordinal() <= 15; diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java index e44406288..f7902ff14 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -137,7 +137,7 @@ public final class ModelHandler { // todo reorganize, alphabetize public static void registerModels() { ModelLoaderRegistry.registerLoader(SpecialFlowerModel.Loader.INSTANCE); - OBJLoader.instance.addDomain(LibMisc.MOD_ID.toLowerCase(Locale.ROOT)); + OBJLoader.INSTANCE.addDomain(LibMisc.MOD_ID.toLowerCase(Locale.ROOT)); ((IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager()).registerReloadListener(FloatingFlowerModel.INSTANCE); /** Subtile block models **/ @@ -814,19 +814,19 @@ public final class ModelHandler { ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory_" + color.getName())); } - item = Item.getItemFromBlock(ModBlocks.doubleFlower1); - for (EnumDyeColor color : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1.getAllowedValues()) { - String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.doubleFlower1).toString(); - String variant = "inventory_" + color.getName(); - ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, variant)); - } - - item = Item.getItemFromBlock(ModBlocks.doubleFlower2); - for (EnumDyeColor color : BotaniaStateProps.DOUBLEFLOWER_VARIANT_2.getAllowedValues()) { - String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.doubleFlower2).toString(); - String variant = "inventory_" + color.getName(); - ModelLoader.setCustomModelResourceLocation(item, color.getMetadata() - 8, new ModelResourceLocation(name, variant)); - } +// item = Item.getItemFromBlock(ModBlocks.doubleFlower1); +// for (EnumDyeColor color : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1.getAllowedValues()) { +// String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.doubleFlower1).toString(); +// String variant = "inventory_" + color.getName(); +// ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, variant)); +// } +// +// item = Item.getItemFromBlock(ModBlocks.doubleFlower2); +// for (EnumDyeColor color : BotaniaStateProps.DOUBLEFLOWER_VARIANT_2.getAllowedValues()) { +// String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.doubleFlower2).toString(); +// String variant = "inventory_" + color.getName(); +// ModelLoader.setCustomModelResourceLocation(item, color.getMetadata() - 8, new ModelResourceLocation(name, variant)); +// } } private static void registerPavement() { 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 7be9d04f6..ffd83db19 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -183,14 +183,13 @@ public class ClientProxy extends CommonProxy { MinecraftForge.EVENT_BUS.register(MiscellaneousIcons.INSTANCE); ModelHandler.registerModels(); - ColorHandler.init(); initRenderers(); } @Override public void init(FMLInitializationEvent event) { super.init(event); - + ColorHandler.init(); initAuxiliaryRender(); ModChallenges.init(); @@ -277,18 +276,13 @@ public class ClientProxy extends CommonProxy { private void initAuxiliaryRender() { Map skinMap = Minecraft.getMinecraft().getRenderManager().getSkinMap(); RenderPlayer render; + render = skinMap.get("default"); + render.addLayer(new ContributorFancinessHandler()); + render.addLayer(new BaubleRenderHandler()); - try { // todo 1.9 get Forge to AT this back -.- - Method m = ReflectionHelper.findMethod(RenderPlayer.class, null, LibObfuscation.ADD_LAYER); - - render = skinMap.get("default"); - m.invoke(render, new ContributorFancinessHandler()); - m.invoke(render, new BaubleRenderHandler()); - - render = skinMap.get("slim"); - m.invoke(render, new ContributorFancinessHandler()); - m.invoke(render, new BaubleRenderHandler()); - } catch (ReflectiveOperationException ignored) {} + render = skinMap.get("slim"); + render.addLayer(new ContributorFancinessHandler()); + render.addLayer(new BaubleRenderHandler()); } @Override diff --git a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java index fb4f96672..6d21631a4 100644 --- a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java @@ -29,7 +29,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import net.minecraftforge.client.model.TRSRTransformation; +import net.minecraftforge.common.model.TRSRTransformation; import net.minecraftforge.client.model.pipeline.IVertexConsumer; import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad; import net.minecraftforge.client.model.pipeline.VertexTransformer; diff --git a/src/main/java/vazkii/botania/client/model/ModelPylon.java b/src/main/java/vazkii/botania/client/model/ModelPylon.java index d597f7335..cb937a9ce 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPylon.java +++ b/src/main/java/vazkii/botania/client/model/ModelPylon.java @@ -50,7 +50,7 @@ public class ModelPylon implements IPylonModel { public ModelPylon() { try { // Load the OBJ - OBJModel model = ((OBJModel) OBJLoader.instance.loadModel(new ResourceLocation("botania:models/block/pylon.obj"))); + OBJModel model = ((OBJModel) OBJLoader.INSTANCE.loadModel(new ResourceLocation("botania:models/block/pylon.obj"))); // Apply the texture and flip the v's of the model IModel manaModel = ((OBJModel) model.retexture(ImmutableMap.of("#pylon", "botania:model/pylon"))).process(ImmutableMap.of("flip-v", "true")); diff --git a/src/main/java/vazkii/botania/client/model/PylonItemModel.java b/src/main/java/vazkii/botania/client/model/PylonItemModel.java index 8d8539aca..8df6069ff 100644 --- a/src/main/java/vazkii/botania/client/model/PylonItemModel.java +++ b/src/main/java/vazkii/botania/client/model/PylonItemModel.java @@ -26,7 +26,7 @@ import net.minecraft.world.World; import net.minecraftforge.client.model.Attributes; import net.minecraftforge.client.model.IModel; import net.minecraftforge.client.model.IPerspectiveAwareModel; -import net.minecraftforge.client.model.TRSRTransformation; +import net.minecraftforge.common.model.TRSRTransformation; import net.minecraftforge.client.model.obj.OBJLoader; import net.minecraftforge.client.model.obj.OBJModel; import net.minecraftforge.fml.common.FMLLog; @@ -69,7 +69,7 @@ public class PylonItemModel implements IBakedModel { // Load the OBJ OBJModel model = null; try { - model = ((OBJModel) OBJLoader.instance.loadModel(new ResourceLocation("botania:models/block/pylon.obj"))); + model = ((OBJModel) OBJLoader.INSTANCE.loadModel(new ResourceLocation("botania:models/block/pylon.obj"))); } catch(Exception e) { FMLLog.log(Level.ERROR, "[Botania]: Error loading pylon item model, substituting missing model"); mana = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); diff --git a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java index df5c455ab..e8ea291a9 100644 --- a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java @@ -34,9 +34,9 @@ import net.minecraft.world.World; import net.minecraftforge.client.model.ICustomModelLoader; import net.minecraftforge.client.model.IModel; import net.minecraftforge.client.model.IModelCustomData; -import net.minecraftforge.client.model.IModelState; +import net.minecraftforge.common.model.IModelState; import net.minecraftforge.client.model.IPerspectiveAwareModel; -import net.minecraftforge.client.model.TRSRTransformation; +import net.minecraftforge.common.model.TRSRTransformation; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.fml.common.FMLLog; import org.apache.commons.lang3.tuple.Pair; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java index ed7e331ad..b007618a6 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java @@ -30,9 +30,9 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraftforge.client.MinecraftForgeClient; -import net.minecraftforge.client.model.IModelState; import net.minecraftforge.client.model.animation.Animation; -import net.minecraftforge.client.model.animation.Event; +import net.minecraftforge.common.animation.Event; +import net.minecraftforge.common.model.IModelState; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.Properties; import org.apache.commons.lang3.tuple.Pair; @@ -170,7 +170,9 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer> pair = te.asm().apply(time); + // todo 1.9 + if (true) return; + Pair> pair = null; // handleEvents(te, time, pair.getRight()); IBakedModel model = blockRenderer.getBlockModelShapes().getModelForState(exState.getClean()); diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java index 078226e48..3b0c317d0 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java @@ -1,5 +1,6 @@ package vazkii.botania.common.block.decor.slabs; +import java.util.Locale; import java.util.Random; import net.minecraft.block.BlockSlab; @@ -120,7 +121,7 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable { SINGLETON { @Override public String getName() { - return name(); + return name().toLowerCase(Locale.ROOT); } } } diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java index 7971d600e..08e40de72 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java @@ -18,7 +18,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.animation.Animation; -import net.minecraftforge.client.model.animation.IAnimationProvider; import net.minecraftforge.common.model.animation.IAnimationStateMachine; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; @@ -27,7 +26,7 @@ import vazkii.botania.api.corporea.ICorporeaRequestor; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.internal.VanillaPacketDispatcher; -public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorporeaRequestor, IAnimationProvider { +public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorporeaRequestor { private static final String TAG_REQUEST_TARGET = "requestTarget"; private static final String TAG_ITEM_COUNT = "itemCount"; @@ -39,13 +38,13 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor int ticks = 0; public int compValue = 0; - private final IAnimationStateMachine asm; + //private final IAnimationStateMachine asm; public TileCorporeaCrystalCube() { if (FMLCommonHandler.instance().getSide() == Side.CLIENT) { - asm = Animation.INSTANCE.load(new ResourceLocation("botania", "asms/block/crystalcube_cube.json"), ImmutableMap.of()); + //asm = Animation.INSTANCE.load(new ResourceLocation("botania", "asms/block/crystalcube_cube.json"), ImmutableMap.of()); } else { - asm = null; + //asm = null; } } @@ -166,9 +165,9 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor onUpdateCount(); } } - +/* todo 1.9 @Override public IAnimationStateMachine asm() { return asm; - } + }*/ } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java index a03c7f089..de4e37d56 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java @@ -16,15 +16,14 @@ import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.animation.Animation; -import net.minecraftforge.client.model.animation.IAnimationProvider; -import net.minecraftforge.client.model.animation.TimeValues; +import net.minecraftforge.common.animation.TimeValues; import net.minecraftforge.common.model.animation.IAnimationStateMachine; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.block.tile.TileMod; -public class TilePump extends TileMod implements IAnimationProvider { +public class TilePump extends TileMod { private static final String TAG_ACTIVE = "active"; @@ -39,15 +38,15 @@ public class TilePump extends TileMod implements IAnimationProvider { int lastComparator = 0; private final TimeValues.VariableValue move; - private final IAnimationStateMachine asm; + //private final IAnimationStateMachine asm; public TilePump() { if (FMLCommonHandler.instance().getSide() == Side.CLIENT) { - move = new TimeValues.VariableValue(0); - asm = Animation.INSTANCE.load(new ResourceLocation("botania", "asms/block/pump.json"), ImmutableMap.of("move", move)); + move = new TimeValues.VariableValue(0); //todo 1.9 + //asm = Animation.INSTANCE.load(new ResourceLocation("botania", "asms/block/pump.json"), ImmutableMap.of("move", move)); } else { move = null; - asm = null; + //asm = null; } } @@ -114,7 +113,7 @@ public class TilePump extends TileMod implements IAnimationProvider { active = cmp.getBoolean(TAG_ACTIVE); if(worldObj != null && worldObj.isRemote) if(prevActive != active) - asm.transition(active ? "moving" : "default"); + ;//asm.transition(active ? "moving" : "default"); } public void setActive(boolean active) { @@ -126,8 +125,8 @@ public class TilePump extends TileMod implements IAnimationProvider { } } - @Override - public IAnimationStateMachine asm() { - return asm; - } +// @Override +// public IAnimationStateMachine asm() { +// return asm; +// } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java index 4fd78cf7a..1b722a0c3 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java @@ -113,8 +113,10 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { if(f > 1.0F) f = 1.0F; - ItemStack ammo = shooter instanceof EntityPlayer ? PlayerHelper.getAmmo(((EntityPlayer) shooter), AMMO_FUNC) : new ItemStack(Items.arrow); - EntityArrow entityarrow = ((ItemArrow) (ammo == null ? Items.arrow : ammo.getItem())).createArrow(world, ammo, shooter); + ItemStack ammo = shooter instanceof EntityPlayer ? PlayerHelper.getAmmo(((EntityPlayer) shooter), AMMO_FUNC) : null; + if(ammo == null) + ammo = new ItemStack(Items.arrow); + EntityArrow entityarrow = ((ItemArrow) ammo.getItem()).createArrow(world, ammo, shooter); if(f == 1.0F) entityarrow.setIsCritical(true); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java index b25f44235..87911b83f 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java @@ -10,8 +10,10 @@ */ package vazkii.botania.common.item.equipment.tool.manasteel; +import java.util.Set; import java.util.regex.Pattern; +import com.google.common.collect.ImmutableSet; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; @@ -21,6 +23,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemAxe; import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemTool; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; @@ -38,7 +41,7 @@ import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.common.registry.GameRegistry; -public class ItemManasteelAxe extends ItemAxe implements IManaUsingItem, ISortableTool { +public class ItemManasteelAxe extends ItemTool implements IManaUsingItem, ISortableTool { private static final Pattern SAPLING_PATTERN = Pattern.compile("(?:(?:(?:[A-Z-_.:]|^)sapling)|(?:(?:[a-z-_.:]|^)Sapling))(?:[A-Z-_.:]|$)"); @@ -49,11 +52,17 @@ public class ItemManasteelAxe extends ItemAxe implements IManaUsingItem, ISortab } public ItemManasteelAxe(ToolMaterial mat, String name) { - super(mat); + super(mat, ImmutableSet.of()); + // todo attack speed and set setCreativeTab(BotaniaCreativeTab.INSTANCE); setUnlocalizedName(name); } + @Override + public Set getToolClasses(ItemStack stack) { + return ImmutableSet.of("axe"); + } + @Override public Item setUnlocalizedName(String par1Str) { GameRegistry.registerItem(this, par1Str);