mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-17 02:45:13 +00:00
Cleanup, implement some easter egg models I missed
This commit is contained in:
1 parent
2c15b6150c
commit
406f89a968
26 files changed
+119
-107
No files matched your search
@@ -171,6 +171,24 @@ public final class ModelHandler {
|
||||
// Cannot use lambdas directly yet because FG/SS can't reobfuscate them, need a dummy wrapper
|
||||
// See https://github.com/MinecraftForge/ForgeGradle/issues/314.
|
||||
|
||||
ModelLoader.registerItemVariants(elementiumShears,
|
||||
new ModelResourceLocation("botania:elementiumShears", "inventory"),
|
||||
new ModelResourceLocation("botania:dammitReddit", "inventory"));
|
||||
ModelLoader.setCustomMeshDefinition(elementiumShears, MesherWrapper.of(stack ->
|
||||
stack.getDisplayName().equalsIgnoreCase("dammit reddit")
|
||||
? new ModelResourceLocation("botania:dammitReddit", "inventory")
|
||||
: new ModelResourceLocation("botania:elementiumShears", "inventory")));
|
||||
|
||||
ModelLoader.registerItemVariants(grassHorn,
|
||||
new ModelResourceLocation("botania:grassHorn0", "inventory"),
|
||||
new ModelResourceLocation("botania:grassHorn1", "inventory"),
|
||||
new ModelResourceLocation("botania:grassHorn2", "inventory"),
|
||||
new ModelResourceLocation("botania:vuvuzela", "inventory"));
|
||||
ModelLoader.setCustomMeshDefinition(grassHorn, MesherWrapper.of(stack ->
|
||||
stack.getDisplayName().toLowerCase().contains("vuvuzela")
|
||||
? new ModelResourceLocation("botania:vuvuzela", "inventory")
|
||||
: new ModelResourceLocation("botania:grassHorn" + stack.getMetadata(), "inventory")));
|
||||
|
||||
ModelLoader.registerItemVariants(infiniteFruit,
|
||||
new ModelResourceLocation("botania:infiniteFruit", "inventory"),
|
||||
new ModelResourceLocation("botania:infiniteFruitBoot", "inventory"));
|
||||
@@ -221,6 +239,14 @@ public final class ModelHandler {
|
||||
return new ModelResourceLocation(path + (ItemTwigWand.getBindMode(stack) ? "_bind" : ""), "inventory");
|
||||
}));
|
||||
|
||||
ModelLoader.registerItemVariants(manaCookie,
|
||||
new ModelResourceLocation("botania:manaCookie", "inventory"),
|
||||
new ModelResourceLocation("botania:totalBiscuit", "inventory"));
|
||||
ModelLoader.setCustomMeshDefinition(manaCookie, MesherWrapper.of(stack ->
|
||||
stack.getDisplayName().toLowerCase().equals("totalbiscuit")
|
||||
? new ModelResourceLocation("botania:totalBiscuit", "inventory")
|
||||
: new ModelResourceLocation("botania:manaCookie", "inventory")));
|
||||
|
||||
ModelLoader.registerItemVariants(manaweaveBoots,
|
||||
new ModelResourceLocation("botania:manaweaveBoots", "inventory"),
|
||||
new ModelResourceLocation("botania:manaweaveBootsHoliday", "inventory"));
|
||||
@@ -443,7 +469,6 @@ public final class ModelHandler {
|
||||
registerItemModel(blackLotus);
|
||||
registerItemModel(blackLotus, 1);
|
||||
registerItemModel(lexicon);
|
||||
registerItemModel(manaCookie);
|
||||
|
||||
registerItemModel(manasteelHelm);
|
||||
registerItemModel(manasteelHelmRevealing);
|
||||
@@ -465,7 +490,6 @@ public final class ModelHandler {
|
||||
registerItemModel(elementiumPick);
|
||||
registerItemModel(elementiumShovel);
|
||||
registerItemModel(elementiumAxe);
|
||||
registerItemModel(elementiumShears);
|
||||
registerItemModel(elementiumSword);
|
||||
|
||||
registerItemModel(terrasteelHelm);
|
||||
@@ -578,7 +602,6 @@ public final class ModelHandler {
|
||||
registerItemModelMetas(cosmetic, LibItemNames.COSMETIC, 32);
|
||||
registerItemModelMetas(craftPattern, LibItemNames.CRAFT_PATTERN, 9);
|
||||
registerItemModelMetas(virus, LibItemNames.VIRUS, 2);
|
||||
registerItemModelMetas(grassHorn, LibItemNames.GRASS_HORN, 3);
|
||||
}
|
||||
|
||||
// Only for models that absolutely can't be converted to JSON. Use VERY sparingly
|
||||
|
||||
@@ -409,7 +409,7 @@ public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IPa
|
||||
|
||||
@Override
|
||||
public GuiLexicon copy() {
|
||||
GuiLexiconEntry gui = new GuiLexiconEntry(entry, this.parent); // todo 1.8 recheck last param (was new GuiScreen())
|
||||
GuiLexiconEntry gui = new GuiLexiconEntry(entry, this.parent);
|
||||
gui.page = page;
|
||||
gui.setTitle();
|
||||
return gui;
|
||||
|
||||
@@ -107,7 +107,6 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented {
|
||||
buttonList.add(leftButton = new GuiButtonPage(13, left, top + guiHeight - 10, false));
|
||||
buttonList.add(rightButton = new GuiButtonPage(14, left + guiWidth - 18, top + guiHeight - 10, true));
|
||||
|
||||
// todo 1.8 verify componentID
|
||||
searchField = new GuiTextField(15, fontRendererObj, left + guiWidth / 2 + 28, top + guiHeight + 6, 200, 10);
|
||||
searchField.setCanLoseFocus(false);
|
||||
searchField.setFocused(true);
|
||||
|
||||
@@ -86,7 +86,7 @@ public class GuiButtonInvisible extends GuiButtonLexicon {
|
||||
key = format.charAt(1);
|
||||
|
||||
for(EnumChatFormatting ecf : EnumChatFormatting.class.getEnumConstants())
|
||||
if(ecf.toString().indexOf(ecf.toString().length() - 1) == key) { // todo 1.8 recheck (want last char of code)
|
||||
if(ecf.toString().indexOf(ecf.toString().length() - 1) == key) {
|
||||
if(ecf.ordinal() > 15)
|
||||
ecf = EnumChatFormatting.BLACK;
|
||||
color = LibMisc.CONTROL_CODE_COLORS[ecf.ordinal()];
|
||||
|
||||
@@ -60,7 +60,7 @@ public class RenderDoppleganger extends RenderBiped<EntityDoppleganger> {
|
||||
};
|
||||
|
||||
public RenderDoppleganger(RenderManager renderManager) {
|
||||
super(renderManager, new ModelPlayer(0.0F, false), 0F); // todo 1.8 was ModelBiped(0.5)
|
||||
super(renderManager, new ModelPlayer(0.0F, false), 0F);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -35,7 +35,7 @@ public class RenderTileSkullOverride extends TileEntitySkullRenderer {
|
||||
@Override
|
||||
public void renderTileEntityAt(TileEntitySkull p_147500_1_, double p_147500_2_, double p_147500_4_, double p_147500_6_, float p_147500_8_, int digProgress) {
|
||||
if (p_147500_1_ != null) {
|
||||
render(p_147500_1_, (float) p_147500_2_, (float) p_147500_4_, (float) p_147500_6_, EnumFacing.getFront(p_147500_1_.getBlockMetadata() & 7) /*todo 1.8*/, p_147500_1_.getSkullRotation() * 360 / 16.0F, p_147500_1_.getSkullType(), p_147500_1_.getPlayerProfile(), digProgress);
|
||||
render(p_147500_1_, (float) p_147500_2_, (float) p_147500_4_, (float) p_147500_6_, EnumFacing.getFront(p_147500_1_.getBlockMetadata() & 7), p_147500_1_.getSkullRotation() * 360 / 16.0F, p_147500_1_.getSkullType(), p_147500_1_.getPlayerProfile(), digProgress);
|
||||
} else {
|
||||
render(null, ((float) p_147500_2_), ((float) p_147500_4_), ((float) p_147500_6_), EnumFacing.NORTH, 0, 3, null, 0);
|
||||
}
|
||||
|
||||
@@ -52,7 +52,7 @@ public class BlockManaGlass extends BlockMod implements ILexiconable {
|
||||
|
||||
@Override
|
||||
public boolean shouldSideBeRendered(IBlockAccess world, BlockPos pos, EnumFacing side) {
|
||||
return shouldSideBeRendered1(world, pos, side.getOpposite()); // todo 1.8 recheck (was 1 - sideInt)
|
||||
return shouldSideBeRendered1(world, pos, side.getOpposite());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+4
-1
@@ -17,6 +17,7 @@ import java.util.List;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockLiquid;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.block.properties.PropertyInteger;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -24,6 +25,7 @@ import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.BlockPos;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.fluids.BlockFluidBase;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.subtile.RadiusDescriptor;
|
||||
import vazkii.botania.api.subtile.signature.PassiveFlower;
|
||||
@@ -62,7 +64,8 @@ public class SubTileHydroangeas extends SubTilePassiveGenerating {
|
||||
BlockPos pos = supertile.getPos().add(offset);
|
||||
|
||||
Material search = getMaterialToSearchFor();
|
||||
if(supertile.getWorld().getBlockState(pos).getBlock().getMaterial() == search && (getBlockToSearchBelow() == null || supertile.getWorld().getBlockState(pos.down()).getBlock() == getBlockToSearchBelow()) && supertile.getWorld().getBlockState(pos).getValue(BlockLiquid.LEVEL)/* todo 1.8 may crash */ == 0) {
|
||||
PropertyInteger prop = supertile.getWorld().getBlockState(pos).getBlock() instanceof BlockLiquid ? BlockLiquid.LEVEL : supertile.getWorld().getBlockState(pos).getBlock() instanceof BlockFluidBase ? BlockFluidBase.LEVEL : null;
|
||||
if(supertile.getWorld().getBlockState(pos).getBlock().getMaterial() == search && (getBlockToSearchBelow() == null || supertile.getWorld().getBlockState(pos.down()).getBlock() == getBlockToSearchBelow()) && (prop == null || supertile.getWorld().getBlockState(pos).getValue(prop) == 0)) {
|
||||
if(search != Material.water)
|
||||
supertile.getWorld().setBlockToAir(pos);
|
||||
else {
|
||||
|
||||
@@ -66,7 +66,6 @@ public class SubTileRafflowsia extends SubTileGenerating {
|
||||
|
||||
float mod = 1F / lastFlowerTimes;
|
||||
|
||||
// todo 1.8 why is meta +1 'ed ?? int meta = supertile.getWorld().getBlockMetadata(x, y, z) + 1;
|
||||
IBlockState state = supertile.getWorld().getBlockState(pos);
|
||||
supertile.getWorld().setBlockToAir(pos);
|
||||
|
||||
|
||||
@@ -68,7 +68,6 @@ public class SubTileSpectrolus extends SubTileGenerating {
|
||||
float mx = (float) (Math.random() - 0.5) * m;
|
||||
float my = (float) (Math.random() - 0.5) * m;
|
||||
float mz = (float) (Math.random() - 0.5) * m;
|
||||
// todo 1.8.8 verify. old: supertile.getWorld().spawnParticle("blockcrack_" + Item.getIdFromItem(stack.getItem()) + "_" + meta, item.posX, item.posY, item.posZ, mx, my, mz);
|
||||
supertile.getWorld().spawnParticle(EnumParticleTypes.ITEM_CRACK, item.posX, item.posY, item.posZ, mx, my, mz, Item.getIdFromItem(stack.getItem()), stack.getItemDamage());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -42,7 +42,7 @@ public class TilePylon extends TileEntity implements ITickable {
|
||||
PylonVariant variant = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.PYLON_VARIANT);
|
||||
|
||||
if(activated && worldObj.isRemote) {
|
||||
if(worldObj.getBlockState(centerPos).getBlock() != getBlockForMeta() || variant != PylonVariant.MANA && portalOff()) { // todo 1.8 clarify
|
||||
if(worldObj.getBlockState(centerPos).getBlock() != getBlockForMeta() || variant != PylonVariant.MANA && portalOff()) {
|
||||
activated = false;
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -31,9 +31,6 @@ public class ModPotions {
|
||||
public static Potion clear;
|
||||
|
||||
public static void init() {
|
||||
// if(Potion.potionTypes.length < 256)
|
||||
// extendPotionArray(); todo 1.8 this should be unnecessary thanks to potion registry
|
||||
|
||||
soulCross = new PotionSoulCross();
|
||||
featherfeet = new PotionFeatherfeet();
|
||||
emptiness = new PotionEmptiness();
|
||||
@@ -42,27 +39,4 @@ public class ModPotions {
|
||||
clear = new PotionClear();
|
||||
}
|
||||
|
||||
private static void extendPotionArray() {
|
||||
Potion[] potionTypes = null;
|
||||
|
||||
for (Field f : Potion.class.getDeclaredFields()) {
|
||||
f.setAccessible(true);
|
||||
try {
|
||||
if (f.getName().equals("potionTypes") || f.getName().equals("field_76425_a")) {
|
||||
Field modfield = Field.class.getDeclaredField("modifiers");
|
||||
modfield.setAccessible(true);
|
||||
modfield.setInt(f, f.getModifiers() & ~Modifier.FINAL);
|
||||
|
||||
potionTypes = (Potion[])f.get(null);
|
||||
final Potion[] newPotionTypes = new Potion[256];
|
||||
System.arraycopy(potionTypes, 0, newPotionTypes, 0, potionTypes.length);
|
||||
f.set(null, newPotionTypes);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
System.err.println("Severe error, please report this to the mod author:");
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -41,6 +41,8 @@ import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemRecord;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.pathfinding.PathNavigateGround;
|
||||
import net.minecraft.pathfinding.PathNavigateSwimmer;
|
||||
import net.minecraft.potion.Potion;
|
||||
import net.minecraft.potion.PotionEffect;
|
||||
import net.minecraft.tileentity.TileEntityBeacon;
|
||||
@@ -118,7 +120,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi
|
||||
public EntityDoppleganger(World par1World) {
|
||||
super(par1World);
|
||||
setSize(0.6F, 1.8F);
|
||||
//todo 1.8 new AI getNavigator().setCanSwim(true);
|
||||
((PathNavigateGround) getNavigator()).setCanSwim(true);
|
||||
tasks.addTask(0, new EntityAISwimming(this));
|
||||
tasks.addTask(1, new EntityAIWatchClosest(this, EntityPlayer.class, Float.MAX_VALUE));
|
||||
isImmuneToFire = true;
|
||||
|
||||
@@ -12,16 +12,40 @@ package vazkii.botania.common.entity;
|
||||
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.ai.EntityAIArrowAttack;
|
||||
import net.minecraft.entity.ai.EntityAIHurtByTarget;
|
||||
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.util.EnumParticleTypes;
|
||||
import net.minecraft.util.MathHelper;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import java.util.Iterator;
|
||||
|
||||
public class EntityPinkWither extends EntityWither {
|
||||
|
||||
public EntityPinkWither(World p_i1701_1_) {
|
||||
super(p_i1701_1_);
|
||||
|
||||
Iterator<EntityAITasks.EntityAITaskEntry> taskIter = this.tasks.taskEntries.iterator();
|
||||
while (taskIter.hasNext()) {
|
||||
EntityAITasks.EntityAITaskEntry entry = taskIter.next();
|
||||
if (entry.action instanceof EntityAIArrowAttack) {
|
||||
taskIter.remove(); // Remove firing wither skulls
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Iterator<EntityAITasks.EntityAITaskEntry> targetTaskIter = this.targetTasks.taskEntries.iterator();
|
||||
while (targetTaskIter.hasNext()) {
|
||||
EntityAITasks.EntityAITaskEntry entry = targetTaskIter.next();
|
||||
if (entry.action instanceof EntityAIHurtByTarget
|
||||
|| entry.action instanceof EntityAINearestAttackableTarget) {
|
||||
targetTaskIter.remove(); // Remove revenge and aggro
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -42,11 +66,6 @@ public class EntityPinkWither extends EntityWither {
|
||||
// NO-OP
|
||||
}
|
||||
|
||||
// @Override todo 1.8 mtd no longer exists?
|
||||
// protected void attackEntity(Entity p_70785_1_, float p_70785_2_) {
|
||||
// // NO-OP
|
||||
// }
|
||||
|
||||
@Override
|
||||
public boolean attackEntityAsMob(Entity p_70652_1_) {
|
||||
return false;
|
||||
@@ -61,11 +80,6 @@ public class EntityPinkWither extends EntityWither {
|
||||
return false;
|
||||
}
|
||||
|
||||
// @Override todo 1.8 new AI
|
||||
// protected boolean isAIEnabled() {
|
||||
// return false;
|
||||
// }
|
||||
|
||||
@Override
|
||||
protected void dropFewItems(boolean p_70628_1_, int p_70628_2_) {
|
||||
// NO-OP
|
||||
|
||||
@@ -60,39 +60,39 @@ public class EntityPixie extends EntityFlyingCreature {
|
||||
this.effect = effect;
|
||||
}
|
||||
|
||||
// @Override todo 1.8 uh oh ... we can't override this anymore
|
||||
// protected void updateEntityActionState() {
|
||||
// EntityLivingBase target = getAttackTarget();
|
||||
// if(target != null) {
|
||||
// double d0 = target.posX + target.width / 2 - posX;
|
||||
// double d1 = target.posY + target.height / 2 - posY;
|
||||
// double d2 = target.posZ + target.width / 2 - posZ;
|
||||
// double d3 = d0 * d0 + d1 * d1 + d2 * d2;
|
||||
//
|
||||
// float mod = 0.45F;
|
||||
// if(getType() == 1)
|
||||
// mod = 0.1F;
|
||||
//
|
||||
// motionX += d0 / d3 * mod;
|
||||
// motionY += d1 / d3 * mod;
|
||||
// motionZ += d2 / d3 * mod;
|
||||
//
|
||||
// if(Math.sqrt(d3) < 1F) {
|
||||
// if(summoner != null) {
|
||||
// if(summoner instanceof EntityPlayer)
|
||||
// target.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) summoner), damage);
|
||||
// else {
|
||||
// target.attackEntityFrom(DamageSource.causeMobDamage(summoner), damage);
|
||||
// }
|
||||
// } else target.attackEntityFrom(DamageSource.causeMobDamage(this), damage);
|
||||
// if(effect != null && !(target instanceof EntityPlayer))
|
||||
// target.addPotionEffect(effect);
|
||||
// die();
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// renderYawOffset = rotationYaw = -((float)Math.atan2(motionX, motionZ)) * 180.0F / (float)Math.PI;
|
||||
// }
|
||||
@Override
|
||||
protected void updateAITasks() {
|
||||
EntityLivingBase target = getAttackTarget();
|
||||
if(target != null) {
|
||||
double d0 = target.posX + target.width / 2 - posX;
|
||||
double d1 = target.posY + target.height / 2 - posY;
|
||||
double d2 = target.posZ + target.width / 2 - posZ;
|
||||
double d3 = d0 * d0 + d1 * d1 + d2 * d2;
|
||||
|
||||
float mod = 0.45F;
|
||||
if(getType() == 1)
|
||||
mod = 0.1F;
|
||||
|
||||
motionX += d0 / d3 * mod;
|
||||
motionY += d1 / d3 * mod;
|
||||
motionZ += d2 / d3 * mod;
|
||||
|
||||
if(Math.sqrt(d3) < 1F) {
|
||||
if(summoner != null) {
|
||||
if(summoner instanceof EntityPlayer)
|
||||
target.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) summoner), damage);
|
||||
else {
|
||||
target.attackEntityFrom(DamageSource.causeMobDamage(summoner), damage);
|
||||
}
|
||||
} else target.attackEntityFrom(DamageSource.causeMobDamage(this), damage);
|
||||
if(effect != null && !(target instanceof EntityPlayer))
|
||||
target.addPotionEffect(effect);
|
||||
die();
|
||||
}
|
||||
}
|
||||
|
||||
renderYawOffset = rotationYaw = -((float)Math.atan2(motionX, motionZ)) * 180.0F / (float)Math.PI;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean attackEntityFrom(DamageSource par1DamageSource, float par2) {
|
||||
|
||||
@@ -51,8 +51,6 @@ public class ItemGrassHorn extends ItemMod {
|
||||
list.add(new ItemStack(item, 1, i));
|
||||
}
|
||||
|
||||
// todo 1.8 return par1ItemStack.getDisplayName().toLowerCase().contains("vuvuzela") ? vuvuzelaIcon : super.getIconIndex(par1ItemStack);
|
||||
|
||||
@Override
|
||||
public String getUnlocalizedName(ItemStack par1ItemStack) {
|
||||
return getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage();
|
||||
|
||||
@@ -48,6 +48,4 @@ public class ItemManaCookie extends ItemFood {
|
||||
return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD);
|
||||
}
|
||||
|
||||
// todo 1.8 return stack.getDisplayName().toLowerCase().equals("totalbiscuit") ? totalBiscuitIcon : super.getIconIndex(stack);
|
||||
|
||||
}
|
||||
@@ -19,8 +19,6 @@ import vazkii.botania.common.lib.LibItemNames;
|
||||
|
||||
public class ItemSlimeBottle extends ItemMod {
|
||||
|
||||
// todo 1.8 smart model?
|
||||
|
||||
public ItemSlimeBottle() {
|
||||
setUnlocalizedName(LibItemNames.SLIME_BOTTLE);
|
||||
setMaxStackSize(1);
|
||||
|
||||
@@ -108,7 +108,6 @@ public class ItemTinyPlanet extends ItemBauble implements IBaubleRender {
|
||||
GlStateManager.translate(0.25F, -0.5F, 0F);
|
||||
GlStateManager.scale(0.5F, 0.5F, 0.5F);
|
||||
Minecraft.getMinecraft().getBlockRendererDispatcher().renderBlockBrightness(ModBlocks.tinyPlanet.getDefaultState(), 1.0F);
|
||||
// RenderBlocks.getInstance().renderBlockAsItem(ModBlocks.tinyPlanet, 0, 1F); todo 1.8
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -137,8 +137,8 @@ public final class ToolCommons {
|
||||
float f2 = player.prevRotationYaw + (player.rotationYaw - player.prevRotationYaw) * f;
|
||||
double d0 = player.prevPosX + (player.posX - player.prevPosX) * f;
|
||||
double d1 = player.prevPosY + (player.posY - player.prevPosY) * f;
|
||||
if (!world.isRemote && player instanceof EntityPlayer)
|
||||
d1 += ((EntityPlayer) player).eyeHeight; // todo 1.8 possibly unneeded
|
||||
if (player instanceof EntityPlayer)
|
||||
d1 += ((EntityPlayer) player).eyeHeight;
|
||||
double d2 = player.prevPosZ + (player.posZ - player.prevPosZ) * f;
|
||||
Vec3 vec3 = new Vec3(d0, d1, d2);
|
||||
float f3 = MathHelper.cos(-f2 * 0.017453292F - (float) Math.PI);
|
||||
|
||||
-5
@@ -41,11 +41,6 @@ public class ItemElementiumShears extends ItemManasteelShears {
|
||||
return par1ItemStack;
|
||||
}
|
||||
|
||||
// @Override todo 1.8
|
||||
// public IIcon getIconIndex(ItemStack par1ItemStack) {
|
||||
// return par1ItemStack.getDisplayName().equalsIgnoreCase("dammit reddit") ? dammitReddit : super.getIconIndex(par1ItemStack);
|
||||
// }
|
||||
|
||||
@Override
|
||||
public void onUsingTick(ItemStack stack, EntityPlayer player, int count) {
|
||||
if(player.worldObj.isRemote)
|
||||
|
||||
@@ -88,7 +88,6 @@ public class PageEntity extends LexiconPage{
|
||||
GlStateManager.rotate(180.0F, 0.0F, 0.0F, 1.0F);
|
||||
GlStateManager.rotate(rotation, 0.0F, 1.0F, 0.0F);
|
||||
RenderHelper.enableStandardItemLighting();
|
||||
// todo 1.8 yOffset gone GlStateManager.translate(0.0F, 0.0F, 0.0F);
|
||||
Minecraft.getMinecraft().getRenderManager().playerViewY = 180.0F;
|
||||
Minecraft.getMinecraft().getRenderManager().renderEntityWithPosYaw(entity, 0.0D, 0.0D, 0.0D, 0.0F, 1.0F);
|
||||
GlStateManager.popMatrix();
|
||||
|
||||
@@ -31,8 +31,8 @@ public final class LibObfuscation {
|
||||
// EntityAIAttackOnCollide
|
||||
public static final String[] CLASS_TARGET = new String[] { "classTarget", "field_75444_h", "g" };
|
||||
|
||||
// EntityAIAvoidEntity // todo 1.8
|
||||
public static final String[] TARGET_ENTITY_CLASS = new String[] { "targetEntityClass", "field_75381_h", "i" };
|
||||
// EntityAIAvoidEntity
|
||||
public static final String[] TARGET_ENTITY_CLASS = new String[] { "field_181064_i", "i" };
|
||||
|
||||
// EntityCreeper
|
||||
public static final String[] TIME_SINCE_IGNITED = new String[] { "timeSinceIgnited", "field_70833_d", "c" };
|
||||
@@ -54,9 +54,6 @@ public final class LibObfuscation {
|
||||
public static final String[] ITEM_IN_USE = new String[] { "itemInUse", "field_71074_e", "g" };
|
||||
public static final String[] ITEM_IN_USE_COUNT = new String[] { "itemInUseCount", "field_71072_f", "h" };
|
||||
|
||||
// Potion
|
||||
public static final String[] IS_BAD_EFFECT = new String[] { "isBadEffect", "field_76418_K", "K" };
|
||||
|
||||
// EntityHorse
|
||||
public static final String[] HORSE_JUMP_STRENGTH = new String[] { "horseJumpStrength", "field_110271_bv", "br" };
|
||||
public static final String[] HORSE_CHEST = new String[] { "horseChest", "field_110296_bG", "bC" };
|
||||
@@ -72,7 +69,7 @@ public final class LibObfuscation {
|
||||
public static final String[] MAX_NEARBY_ENTITIES = new String[] { "maxNearbyEntities", "field_98292_k", "k" };
|
||||
public static final String[] MAX_SPAWN_DELAY = new String[] { "maxSpawnDelay", "field_98293_h", "h" };
|
||||
public static final String[] MIN_SPAWN_DELAY = new String[] { "minSpawnDelay", "field_98283_g", "g" };
|
||||
public static final String[] POTENTIAL_ENTITY_SPAWNS = new String[] { "potentialEntitySpawns", "field_98285_e", "e" }; // Todo 1.8 new name makes no sense -> "minecartToSpawn"
|
||||
public static final String[] POTENTIAL_ENTITY_SPAWNS = new String[] { "minecartToSpawn", "field_98285_e", "c" }; // Todo 1.8 new name makes no sense -> "minecartToSpawn" see MCP name github issue
|
||||
public static final String[] SPAWN_DELAY = new String[] { "spawnDelay", "field_98286_b", "a" };
|
||||
public static final String[] PREV_MOB_ROTATION = new String[] { "prevMobRotation", "field_98284_d", "f" };
|
||||
public static final String[] MOB_ROTATION = new String[] { "mobRotation", "field_98287_c", "e" };
|
||||
@@ -94,9 +91,6 @@ public final class LibObfuscation {
|
||||
|
||||
// Entityliving
|
||||
public static final String[] GET_LIVING_SOUND = new String[] { "getLivingSound", "func_70639_aQ", "z" };
|
||||
|
||||
// TextureAtlasSprite
|
||||
public static final String[] ANIMATION_METADATA = new String[] { "animationMetadata", "field_110982_k", "k" };
|
||||
|
||||
// RenderGlobal
|
||||
public static final String[] STAR_GL_CALL_LIST = new String[] { "starGLCallList", "field_72772_v", "p" };
|
||||
|
||||
Reference in new issue
Block a user