mirror of
https://github.com/Ellpeck/ActuallyAdditions.git
synced 2024-12-22 19:39:24 +01:00
Fixed Texture Errors occuring
This commit is contained in:
parent
acd7d990f3
commit
c1eeebd50b
5 changed files with 22 additions and 12 deletions
|
@ -6,6 +6,7 @@ import ellpeck.actuallyadditions.util.BlockUtil;
|
|||
import ellpeck.actuallyadditions.util.INameableItem;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.EnumRarity;
|
||||
|
@ -71,6 +72,12 @@ public class BlockSlabs extends Block implements INameableItem{
|
|||
return this.fullBlock.getIcon(0, 0);
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerBlockIcons(IIconRegister iconReg){
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName(){
|
||||
return this.name;
|
||||
|
|
|
@ -8,6 +8,7 @@ import ellpeck.actuallyadditions.util.INameableItem;
|
|||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockBush;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.EnumRarity;
|
||||
|
@ -58,6 +59,12 @@ public class BlockWildPlant extends BlockBush implements INameableItem{
|
|||
return metadata >= allWildPlants.length ? null : allWildPlants[metadata].wildVersionOf.getIcon(0, 7);
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerBlockIcons(IIconRegister iconReg){
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName(){
|
||||
return "blockWild";
|
||||
|
|
|
@ -10,7 +10,7 @@ public class VillageCustomCropFieldHandler implements VillagerRegistry.IVillageC
|
|||
|
||||
@Override
|
||||
public StructureVillagePieces.PieceWeight getVillagePieceWeight(Random random, int i){
|
||||
return new StructureVillagePieces.PieceWeight(VillageComponentCustomCropField.class, 5, 2);
|
||||
return new StructureVillagePieces.PieceWeight(VillageComponentCustomCropField.class, 5, 1);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -9,12 +9,16 @@ import java.util.UUID;
|
|||
|
||||
public class FakePlayerUtil{
|
||||
|
||||
public static final String fakeName = "EllpecksActuallyAdditionsFakePlayer";
|
||||
public static GameProfile fakeProfile = new GameProfile(UUID.nameUUIDFromBytes(fakeName.getBytes()), fakeName);
|
||||
private static final String fakeName = "EllpecksActuallyAdditionsFakePlayer";
|
||||
private static GameProfile fakeProfile = new GameProfile(UUID.nameUUIDFromBytes(fakeName.getBytes()), fakeName);
|
||||
private static FakePlayer theFakePlayer;
|
||||
|
||||
public static FakePlayer newFakePlayer(World world){
|
||||
if(world instanceof WorldServer){
|
||||
return new FakePlayer((WorldServer)world, fakeProfile);
|
||||
if(theFakePlayer == null){
|
||||
theFakePlayer = new FakePlayer((WorldServer)world, fakeProfile);
|
||||
}
|
||||
return theFakePlayer;
|
||||
}
|
||||
else return null;
|
||||
}
|
||||
|
|
|
@ -316,8 +316,6 @@ item.actuallyadditions.itemFoodCarrotJuice.name=Carrot Juice
|
|||
item.actuallyadditions.itemFoodPumpkinStew.name=Pumpkin Stew
|
||||
item.actuallyadditions.itemFoodCheese.name=Cheese
|
||||
|
||||
item.actuallyadditions.itemUpgradeSpeed.name=Speed Upgrade
|
||||
|
||||
item.actuallyadditions.itemMiscCoil.name=Basic Coil
|
||||
item.actuallyadditions.itemMiscCoilAdvanced.name=Advanced Coil
|
||||
|
||||
|
@ -367,12 +365,6 @@ tooltip.actuallyadditions.itemJamPiCo.desc=Pineapple and Coconut
|
|||
tooltip.actuallyadditions.itemHairyBall.desc.1=A Ball of Hair dropped from a Cat...
|
||||
tooltip.actuallyadditions.itemHairyBall.desc.2=Maybe you can get something from it by using it...
|
||||
|
||||
tooltip.actuallyadditions.itemUpgradeSpeed.desc.1=Speeds up Machines when placed in their Upgrade Slot
|
||||
tooltip.actuallyadditions.itemUpgradeSpeed.desc.2=Works in:
|
||||
tooltip.actuallyadditions.itemUpgradeSpeed.desc.3=-Double Furnace
|
||||
tooltip.actuallyadditions.itemUpgradeSpeed.desc.4=-Crusher
|
||||
tooltip.actuallyadditions.itemUpgradeSpeed.desc.5=-Double Crusher
|
||||
|
||||
tooltip.actuallyadditions.blockPhantomRange.desc=Range
|
||||
|
||||
tooltip.actuallyadditions.blockCompost.desc=Used to make Fertilizer with Mashed Food
|
||||
|
|
Loading…
Reference in a new issue