Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-26 00:38:35 +01:00
Code Issues Projects Releases Wiki Activity

Fixed Texture Errors occuring

Browse source
This commit is contained in:
Ellpeck 2015-07-06 23:41:10 +02:00
parent acd7d990f3
commit c1eeebd50b
5 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/ellpeck/actuallyadditions/blocks/BlockSlabs.java
View file

@ -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;

7
src/main/java/ellpeck/actuallyadditions/blocks/BlockWildPlant.java
View file

@ -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";

2
src/main/java/ellpeck/actuallyadditions/gen/VillageCustomCropFieldHandler.java
View file

@ -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

10
src/main/java/ellpeck/actuallyadditions/util/FakePlayerUtil.java
View file

@ -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;
}

8
src/main/resources/assets/actuallyadditions/lang/en_US.lang
View file

@ -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