Various cleanups, updated alt textures to 1.9

This commit is contained in:
Vincent Lee committed 2016-05-04 18:38:09 -05:00
1 parent a0d251fafd
commit 2d412ac70f
7 files changed
+13 -28

No files matched your search

@@ -66,21 +66,6 @@ public final class MultiblockRenderHandler {
return true;
}
});
// TODO also a temporary shim for same reason as above
IMultiblockRenderHook.renderHooks.put(ModBlocks.pool, new IMultiblockRenderHook() {
@Override
public void renderBlockForMultiblock(IBlockAccess world, Multiblock mb, IBlockState state, MultiblockComponent comp) {
GlStateManager.translate(-0.5F, -0.5F, 0.5F);
IBakedModel model = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelForState(ModBlocks.pool.getDefaultState());
Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightness(model, ModBlocks.pool.getDefaultState(), 1.0F, false);
}
@Override
public boolean needsTranslate(IBlockState state) {
return true;
}
});
}
public static void setMultiblock(MultiblockSet set) {
@@ -14,6 +14,9 @@ import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.client.renderer.entity.RenderWither;
import net.minecraft.entity.boss.EntityWither;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.event.RenderGameOverlayEvent;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import vazkii.botania.client.lib.LibResources;
public class RenderPinkWither extends RenderWither {
@@ -24,15 +27,6 @@ public class RenderPinkWither extends RenderWither {
super(p_i46130_1_);
}
@Override
public void doRender(EntityWither p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) {
super.doRender(p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
/*if(BossStatus.bossName.equals(p_76986_1_.getDisplayName().getFormattedText())) { todo 1.9
BossStatus.statusBarTime = -1;
BossStatus.hasColorModifier = false;
}*/
}
@Override
protected ResourceLocation getEntityTexture(EntityWither p_110775_1_) {
return resource;
@@ -1747,7 +1747,6 @@ public final class ModCraftingRecipes {
recipeBlackHoleTalisman = BotaniaAPI.getLatestAddedRecipe();
// 1.8 Stone Chiseling
// todo remove when Quark adds these?
if (Botania.quarkLoaded) {
recipe18StoneChisel = new ArrayList<>();
ItemStack[] quarkBlocks = {
@@ -2223,7 +2222,7 @@ public final class ModCraftingRecipes {
'Q', od));
GameRegistry.addRecipe(new ItemStack(block, 1, meta),
"Q", "Q",
'Q', new ItemStack(slab)); // TODO this causes conflicts between the brick slab -> brick restoration recipe and the brick slab -> chiseled brick recipe
'Q', new ItemStack(slab));
}
private static void addWall(Block block, int blockMeta, Block wall, int wallMeta) {
@@ -133,7 +133,7 @@ public final class ModManaAlchemyRecipes {
if(ConfigHandler.stones18Enabled) {
stoneRecipes = new ArrayList<>();
stoneRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.stone, 1, 5), "stone", 200)); // Stone->Andesite todo 1.8.8 might want to un-OD this?
stoneRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.stone, 1, 5), "stone", 200)); // Stone->Andesite
stoneRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.stone, 1, 3), new ItemStack(Blocks.stone, 1, 5), 200)); // Andesite->Diorite
stoneRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.stone, 1, 1), new ItemStack(Blocks.stone, 1, 3), 200)); // Diorite->Granite
stoneRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.stone, 1, 5), new ItemStack(Blocks.stone, 1, 1), 200)); // Granite->Andesite
@@ -16,6 +16,7 @@ import net.minecraft.entity.ai.EntityAINearestAttackableTarget;
import net.minecraft.entity.ai.EntityAITasks;
import net.minecraft.entity.boss.EntityWither;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumHand;
import net.minecraft.util.EnumParticleTypes;
@@ -80,6 +81,12 @@ public class EntityPinkWither extends EntityWither {
// NO-OP
}
@Override
public void setBossVisibleTo(EntityPlayerMP player)
{
// NO-OP
}
// COPYPASTA
private double func_82214_u(int p_82214_1_)