Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-06-01 21:43:38 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1 from Ellpeck/1.8

Browse source 
Update Repository
This commit is contained in:
canitzp 2016-01-09 18:10:18 +01:00
parent 8efe5482f8 bca7812097
commit 9cda52f90b
257 changed files with 2742 additions and 1350 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
specialPeopleStuff.properties
View file

@ -1,4 +1,4 @@
ellpeck=ActuallyAdditions:blockMiner@0
ellpeck=ActuallyAdditions:itemBooklet@0
dqmhose=minecraft:torch@0
twoofeight=ActuallyAdditions:blockHeatCollector@0
larixine=ActuallyAdditions:blockBlackLotus@0

26
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java
View file

@ -19,14 +19,13 @@ import de.ellpeck.actuallyadditions.mod.util.PosUtil;
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.entity.player.EntityPlayer;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.MathHelper;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
public class BlockCoffeeMachine extends BlockContainerBase{
@ -88,22 +87,21 @@ public class BlockCoffeeMachine extends BlockContainerBase{
}
@Override
public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack stack){
int rotation = MathHelper.floor_double((double)(player.rotationYaw*4.0F/360.0F)+0.5D) & 3;
public void setBlockBoundsBasedOnState(IBlockAccess world, BlockPos pos){
int meta = PosUtil.getMetadata(pos, world);
float f = 0.0625F;
if(rotation == 0){
PosUtil.setMetadata(pos, world, 0, 2);
if(meta == 0){
this.setBlockBounds(0F, 0F, 0F, 1F, 1F, 1F-f*3F);
}
if(rotation == 1){
PosUtil.setMetadata(pos, world, 3, 2);
if(meta == 1){
this.setBlockBounds(0F, 0F, 0F, 1F-f*3F, 1F, 1F);
}
if(rotation == 2){
PosUtil.setMetadata(pos, world, 1, 2);
if(meta == 2){
this.setBlockBounds(0F, 0F, f*3F, 1F, 1F, 1F);
}
if(rotation == 3){
PosUtil.setMetadata(pos, world, 2, 2);
if(meta == 3){
this.setBlockBounds(f*3F, 0F, 0F, 1F, 1F, 1F);
}
super.onBlockPlacedBy(world, pos, state, player, stack);
}
}

29
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java
View file

@ -78,21 +78,24 @@ public class BlockColoredLamp extends BlockBase{
return true;
}
//Changing Colors
int[] oreIDs = OreDictionary.getOreIDs(player.getCurrentEquippedItem());
if(oreIDs.length > 0){
for(int oreID : oreIDs){
String name = OreDictionary.getOreName(oreID);
TheColoredLampColors color = TheColoredLampColors.getColorFromDyeName(name);
if(color != null){
if(PosUtil.getMetadata(pos, world) != color.ordinal()){
if(!world.isRemote){
PosUtil.setMetadata(pos, world, color.ordinal(), 2);
if(!player.capabilities.isCreativeMode){
player.inventory.decrStackSize(player.inventory.currentItem, 1);
ItemStack stack = player.getCurrentEquippedItem();
if(stack != null){
//Changing Colors
int[] oreIDs = OreDictionary.getOreIDs(stack);
if(oreIDs.length > 0){
for(int oreID : oreIDs){
String name = OreDictionary.getOreName(oreID);
TheColoredLampColors color = TheColoredLampColors.getColorFromDyeName(name);
if(color != null){
if(PosUtil.getMetadata(pos, world) != color.ordinal()){
if(!world.isRemote){
PosUtil.setMetadata(pos, world, color.ordinal(), 2);
if(!player.capabilities.isCreativeMode){
player.inventory.decrStackSize(player.inventory.currentItem, 1);
}
}
return true;
}
return true;
}
}
}

18
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGreenhouseGlass.java
View file

@ -12,11 +12,16 @@ package de.ellpeck.actuallyadditions.mod.blocks;
import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase;
import de.ellpeck.actuallyadditions.mod.tile.TileEntityGreenhouseGlass;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumWorldBlockLayer;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@ -37,6 +42,11 @@ public class BlockGreenhouseGlass extends BlockContainerBase{
return EnumWorldBlockLayer.CUTOUT;
}
@Override
public boolean isFullCube(){
return false;
}
@Override
public boolean isOpaqueCube(){
return false;
@ -52,4 +62,12 @@ public class BlockGreenhouseGlass extends BlockContainerBase{
return new TileEntityGreenhouseGlass();
}
@Override
@SideOnly(Side.CLIENT)
public boolean shouldSideBeRendered(IBlockAccess worldIn, BlockPos pos, EnumFacing side){
IBlockState state = worldIn.getBlockState(pos);
Block block = state.getBlock();
return worldIn.getBlockState(pos.offset(side.getOpposite())) != state || block != this && block != this && super.shouldSideBeRendered(worldIn, pos, side);
}
}

2
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java
View file

@ -65,7 +65,7 @@ public class BlockLaserRelay extends BlockContainerBase{
@Override
public IBlockState onBlockPlaced(World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, int meta, EntityLivingBase base){
return this.getStateFromMeta(meta);
return this.getStateFromMeta(side.ordinal());
}
@Override

14
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMisc.java
View file

@ -10,9 +10,11 @@
package de.ellpeck.actuallyadditions.mod.blocks;
import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
import de.ellpeck.actuallyadditions.mod.blocks.base.BlockBase;
import de.ellpeck.actuallyadditions.mod.blocks.base.ItemBlockBase;
import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheMiscBlocks;
import de.ellpeck.actuallyadditions.mod.util.ModUtil;
import de.ellpeck.actuallyadditions.mod.util.StringUtil;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
@ -22,6 +24,7 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@ -49,6 +52,17 @@ public class BlockMisc extends BlockBase{
return this.getMetaFromState(state);
}
@Override
protected void registerRendering(){
ResourceLocation[] resLocs = new ResourceLocation[allMiscBlocks.length];
for(int i = 0; i < allMiscBlocks.length; i++){
String name = this.getBaseName()+allMiscBlocks[i].name;
resLocs[i] = new ResourceLocation(ModUtil.MOD_ID_LOWER, name);
ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this, 1, i), new ResourceLocation(ModUtil.MOD_ID_LOWER, name));
}
ActuallyAdditions.proxy.addRenderVariant(Item.getItemFromBlock(this), resLocs);
}
@SuppressWarnings("all")
@SideOnly(Side.CLIENT)
public void getSubBlocks(Item item, CreativeTabs tab, List list){

1
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBushBase.java
View file

@ -28,6 +28,7 @@ public class BlockBushBase extends BlockBush{
public BlockBushBase(String name){
this.name = name;
this.setStepSound(soundTypeGrass);
this.register();
}

3
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java
View file

@ -159,16 +159,19 @@ public abstract class BlockContainerBase extends BlockContainer{
if(tile instanceof IEnergySaver){
((IEnergySaver)tile).setEnergy(stack.getTagCompound().getInteger("Energy"));
stack.getTagCompound().removeTag("Energy");
}
if(tile instanceof IFluidSaver){
int amount = stack.getTagCompound().getInteger("FluidAmount");
stack.getTagCompound().removeTag("FluidAmount");
if(amount > 0){
FluidStack[] fluids = new FluidStack[amount];
for(int i = 0; i < amount; i++){
NBTTagCompound compound = stack.getTagCompound().getCompoundTag("Fluid"+i);
stack.getTagCompound().removeTag("Fluid"+i);
if(compound != null){
fluids[i] = FluidStack.loadFluidStackFromNBT(compound);
}

150
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockWallAA.java
View file

@ -10,26 +10,28 @@
package de.ellpeck.actuallyadditions.mod.blocks.base;
import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
import de.ellpeck.actuallyadditions.mod.creative.CreativeTab;
import de.ellpeck.actuallyadditions.mod.util.ModUtil;
import net.minecraft.block.Block;
import net.minecraft.block.BlockFenceGate;
import net.minecraft.block.BlockWall;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.BlockState;
import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.EnumRarity;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import java.util.List;
public class BlockWallAA extends BlockWall{
public class BlockWallAA extends BlockBase{
private String name;
private int meta;
public BlockWallAA(String name, Block base){
@ -37,44 +39,14 @@ public class BlockWallAA extends BlockWall{
}
public BlockWallAA(String name, Block base, int meta){
super(base);
this.name = name;
super(base.getMaterial(), name);
this.meta = meta;
this.register();
}
this.setHardness(1.5F);
this.setResistance(10F);
this.setStepSound(base.stepSound);
private void register(){
this.setUnlocalizedName(ModUtil.MOD_ID_LOWER+"."+this.getBaseName());
GameRegistry.registerBlock(this, this.getItemBlock(), this.getBaseName());
if(this.shouldAddCreative()){
this.setCreativeTab(CreativeTab.instance);
}
else{
this.setCreativeTab(null);
}
this.registerRendering();
}
protected void registerRendering(){
ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this), new ResourceLocation(ModUtil.MOD_ID_LOWER, this.getBaseName()));
}
protected String getBaseName(){
return this.name;
}
protected Class<? extends ItemBlockBase> getItemBlock(){
return ItemBlockBase.class;
}
public boolean shouldAddCreative(){
return true;
}
public EnumRarity getRarity(ItemStack stack){
return EnumRarity.COMMON;
this.setDefaultState(this.blockState.getBaseState().withProperty(BlockWall.UP, false).withProperty(BlockWall.NORTH, false).withProperty(BlockWall.EAST, false).withProperty(BlockWall.SOUTH, false).withProperty(BlockWall.WEST, false));
}
@SuppressWarnings("unchecked")
@ -88,4 +60,96 @@ public class BlockWallAA extends BlockWall{
public int damageDropped(IBlockState state){
return meta;
}
@Override
public boolean isFullCube(){
return false;
}
@Override
public boolean isPassable(IBlockAccess worldIn, BlockPos pos){
return false;
}
@Override
public boolean isOpaqueCube(){
return false;
}
@Override
public void setBlockBoundsBasedOnState(IBlockAccess worldIn, BlockPos pos){
boolean flag = this.canConnectTo(worldIn, pos.north());
boolean flag1 = this.canConnectTo(worldIn, pos.south());
boolean flag2 = this.canConnectTo(worldIn, pos.west());
boolean flag3 = this.canConnectTo(worldIn, pos.east());
float f = 0.25F;
float f1 = 0.75F;
float f2 = 0.25F;
float f3 = 0.75F;
float f4 = 1.0F;
if(flag){
f2 = 0.0F;
}
if(flag1){
f3 = 1.0F;
}
if(flag2){
f = 0.0F;
}
if(flag3){
f1 = 1.0F;
}
if(flag && flag1 && !flag2 && !flag3){
f4 = 0.8125F;
f = 0.3125F;
f1 = 0.6875F;
}
else if(!flag && !flag1 && flag2 && flag3){
f4 = 0.8125F;
f2 = 0.3125F;
f3 = 0.6875F;
}
this.setBlockBounds(f, 0.0F, f2, f1, f4, f3);
}
@Override
public AxisAlignedBB getCollisionBoundingBox(World worldIn, BlockPos pos, IBlockState state){
this.setBlockBoundsBasedOnState(worldIn, pos);
this.maxY = 1.5D;
return super.getCollisionBoundingBox(worldIn, pos, state);
}
public boolean canConnectTo(IBlockAccess worldIn, BlockPos pos){
Block block = worldIn.getBlockState(pos).getBlock();
return block != Blocks.barrier && (!(block != this && !(block instanceof BlockFenceGate)) || ((block.getMaterial().isOpaque() && block.isFullCube()) && block.getMaterial() != Material.gourd));
}
@Override
@SideOnly(Side.CLIENT)
public boolean shouldSideBeRendered(IBlockAccess worldIn, BlockPos pos, EnumFacing side){
return side != EnumFacing.DOWN || super.shouldSideBeRendered(worldIn, pos, side);
}
@Override
public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos){
return state.withProperty(BlockWall.UP, !worldIn.isAirBlock(pos.up())).withProperty(BlockWall.NORTH, this.canConnectTo(worldIn, pos.north())).withProperty(BlockWall.EAST, this.canConnectTo(worldIn, pos.east())).withProperty(BlockWall.SOUTH, this.canConnectTo(worldIn, pos.south())).withProperty(BlockWall.WEST, this.canConnectTo(worldIn, pos.west()));
}
@Override
protected BlockState createBlockState(){
return new BlockState(this, BlockWall.UP, BlockWall.NORTH, BlockWall.EAST, BlockWall.WEST, BlockWall.SOUTH);
}
@Override
public IBlockState getStateFromMeta(int meta){
return this.getDefaultState();
}
@Override
public int getMetaFromState(IBlockState state){
return 0;
}
}

48
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderInventory.java
View file

@ -1,48 +0,0 @@
/*
* This file ("RenderInventory.java") is part of the Actually Additions Mod for Minecraft.
* It is created and owned by Ellpeck and distributed
* under the Actually Additions License to be found at
* http://ellpeck.de/actaddlicense/
* View the source code at https://github.com/Ellpeck/ActuallyAdditions
*
* © 2016 Ellpeck
*/
package de.ellpeck.actuallyadditions.mod.blocks.render;
//TODO Fix the rendering handler
public class RenderInventory{
private RenderTileEntity tileRender;
private int renderID;
public RenderInventory(RenderTileEntity tileRender, int renderID){
this.tileRender = tileRender;
this.renderID = renderID;
}
/*@Override
public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer){
GlStateManager.glPushMatrix();
Minecraft.getMinecraft().renderEngine.bindTexture(this.tileRender.resLoc);
GlStateManager.glTranslatef(0F, 1F, 0F);
GlStateManager.glRotatef(180F, 1F, 0F, 0F);
this.tileRender.theModel.render(0.0625F);
GlStateManager.glPopMatrix();
}
@Override
public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer){
return false;
}
@Override
public boolean shouldRender3DInInventory(int modelId){
return true;
}
@Override
public int getRenderId(){
return this.renderID;
}*/
}

61
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderLaserRelay.java
View file

@ -1,61 +0,0 @@
/*
* This file ("RenderLaserRelay.java") is part of the Actually Additions Mod for Minecraft.
* It is created and owned by Ellpeck and distributed
* under the Actually Additions License to be found at
* http://ellpeck.de/actaddlicense/
* View the source code at https://github.com/Ellpeck/ActuallyAdditions
*
* © 2016 Ellpeck
*/
package de.ellpeck.actuallyadditions.mod.blocks.render;
import de.ellpeck.actuallyadditions.mod.blocks.render.model.ModelBaseAA;
import de.ellpeck.actuallyadditions.mod.util.PosUtil;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.tileentity.TileEntity;
public class RenderLaserRelay extends RenderTileEntity{
public RenderLaserRelay(ModelBaseAA model){
super(model);
}
@Override
public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float par5, int par6){
GlStateManager.pushMatrix();
GlStateManager.translate((float)x+0.5F, (float)y-0.5F, (float)z+0.5F);
GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F);
GlStateManager.translate(0.0F, -2.0F, 0.0F);
this.bindTexture(resLoc);
int meta = PosUtil.getMetadata(tile.getPos(), tile.getWorld());
if(meta == 0){
GlStateManager.rotate(180F, 1F, 0F, 0F);
GlStateManager.translate(0F, -2F, 0F);
}
else if(meta == 3){
GlStateManager.rotate(-90, 1F, 0F, 0F);
GlStateManager.translate(0F, -1F, 1F);
}
else if(meta == 2){
GlStateManager.rotate(90, 1F, 0F, 0F);
GlStateManager.translate(0F, -1F, -1F);
}
else if(meta == 4){
GlStateManager.rotate(90, 0F, 0F, 1F);
GlStateManager.translate(1F, -1F, 0F);
}
else if(meta == 5){
GlStateManager.rotate(90, 0F, 0F, -1F);
GlStateManager.translate(-1F, -1F, 0F);
}
GlStateManager.scale(0.85F, 0.85F, 0.85F);
GlStateManager.translate(0F, 0.2657F, 0F);
theModel.render(0.0625F);
GlStateManager.popMatrix();
}
}

19
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderReconstructorLens.java
View file

@ -11,20 +11,15 @@
package de.ellpeck.actuallyadditions.mod.blocks.render;
import de.ellpeck.actuallyadditions.api.lens.ILensItem;
import de.ellpeck.actuallyadditions.mod.tile.TileEntityAtomicReconstructor;
import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
import de.ellpeck.actuallyadditions.mod.util.PosUtil;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
//TODO Fix Reconstructor Lens rendering
public class RenderReconstructorLens extends TileEntitySpecialRenderer{
@Override
public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float par5, int par6){
if(!(tile instanceof TileEntityAtomicReconstructor)){
/*if(!(tile instanceof TileEntityAtomicReconstructor)){
return;
}
ItemStack stack = ((TileEntityAtomicReconstructor)tile).getStackInSlot(0);
@ -37,41 +32,35 @@ public class RenderReconstructorLens extends TileEntitySpecialRenderer{
int meta = PosUtil.getMetadata(tile.getPos(), tile.getWorld());
if(meta == 0){
GlStateManager.translate(0F, -0.5F, 0F);
GlStateManager.translate(-0.25F, 0F, -0.25F);
GlStateManager.rotate(90F, 1F, 0F, 0F);
}
if(meta == 1){
GlStateManager.translate(0F, -1.5F-0.5F/16F, 0F);
GlStateManager.translate(-0.25F, 0F, -0.25F);
GlStateManager.rotate(90F, 1F, 0F, 0F);
}
if(meta == 2){
GlStateManager.translate(0F, -1F, 0F);
GlStateManager.translate(0F, 0F, -0.5F);
GlStateManager.translate(-0.25F, -0.25F, 0F);
}
if(meta == 3){
GlStateManager.translate(0F, -1F, 0F);
GlStateManager.translate(0F, 0F, 0.5F+0.5F/16F);
GlStateManager.translate(-0.25F, -0.25F, 0F);
}
if(meta == 4){
GlStateManager.translate(0F, -1F, 0F);
GlStateManager.translate(0.5F+0.5F/16F, 0F, 0F);
GlStateManager.translate(0F, -0.25F, 0.25F);
GlStateManager.rotate(90F, 0F, 1F, 0F);
}
if(meta == 5){
GlStateManager.translate(0F, -1F, 0F);
GlStateManager.translate(-0.5F, 0F, 0F);
GlStateManager.translate(0F, -0.25F, 0.25F);
GlStateManager.rotate(90F, 0F, 1F, 0F);
}
GlStateManager.scale(0.5F, 0.5F, 0.5F);
AssetUtil.renderItemInWorld(stack, 0);
AssetUtil.renderItemInWorld(stack);
GlStateManager.popMatrix();
}
}*/
}
}

28
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderSmileyCloud.java
View file

@ -10,30 +10,17 @@
package de.ellpeck.actuallyadditions.mod.blocks.render;
import de.ellpeck.actuallyadditions.mod.blocks.render.model.ModelBaseAA;
import de.ellpeck.actuallyadditions.mod.misc.cloud.ISmileyCloudEasterEgg;
import de.ellpeck.actuallyadditions.mod.misc.cloud.SmileyCloudEasterEggs;
import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy;
import de.ellpeck.actuallyadditions.mod.tile.TileEntitySmileyCloud;
import de.ellpeck.actuallyadditions.mod.util.ModUtil;
import de.ellpeck.actuallyadditions.mod.util.PosUtil;
import de.ellpeck.actuallyadditions.mod.util.StringUtil;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;
public class RenderSmileyCloud extends RenderTileEntity{
//TODO Fix Smiley Cloud
public class RenderSmileyCloud extends TileEntitySpecialRenderer{
private static final ResourceLocation resLocValentine = new ResourceLocation(ModUtil.MOD_ID_LOWER, "textures/blocks/models/modelPinkFluffyUnicloud.png");
public RenderSmileyCloud(ModelBaseAA model){
super(model);
}
//private static final ResourceLocation resLocValentine = new ResourceLocation(ModUtil.MOD_ID_LOWER, "textures/blocks/models/modelPinkFluffyUnicloud.png");
@Override
public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float par5, int partial){
if(!(tile instanceof TileEntitySmileyCloud)){
/*if(!(tile instanceof TileEntitySmileyCloud)){
return;
}
TileEntitySmileyCloud theCloud = (TileEntitySmileyCloud)tile;
@ -122,7 +109,7 @@ public class RenderSmileyCloud extends RenderTileEntity{
GlStateManager.enableBlend();
GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
//TODO Fix nameplate with Smiley Cloud
/*Tessellator tessellator = Tessellator.getInstance();
Tessellator tessellator = Tessellator.getInstance();
GlStateManager.glDisable(GlStateManager.GL_TEXTURE_2D);
tessellator.startDrawingQuads();
int i = Minecraft.getMinecraft().fontRendererObj.getStringWidth(theCloud.name)/2;
@ -132,7 +119,7 @@ public class RenderSmileyCloud extends RenderTileEntity{
tessellator.addVertex(i+1, 8.0D, 0.0D);
tessellator.addVertex(i+1, -1.0D, 0.0D);
tessellator.draw();
GlStateManager.glEnable(GlStateManager.GL_TEXTURE_2D);*/
GlStateManager.glEnable(GlStateManager.GL_TEXTURE_2D);
GlStateManager.depthMask(true);
Minecraft.getMinecraft().fontRendererObj.drawString(theCloud.name, -Minecraft.getMinecraft().fontRendererObj.getStringWidth(theCloud.name)/2, 0, StringUtil.DECIMAL_COLOR_WHITE);
@ -146,6 +133,7 @@ public class RenderSmileyCloud extends RenderTileEntity{
}
}
GlStateManager.popMatrix();
*/
}
}

58
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderTileEntity.java
View file

@ -1,58 +0,0 @@
/*
* This file ("RenderTileEntity.java") is part of the Actually Additions Mod for Minecraft.
* It is created and owned by Ellpeck and distributed
* under the Actually Additions License to be found at
* http://ellpeck.de/actaddlicense/
* View the source code at https://github.com/Ellpeck/ActuallyAdditions
*
* © 2016 Ellpeck
*/
package de.ellpeck.actuallyadditions.mod.blocks.render;
import de.ellpeck.actuallyadditions.mod.blocks.render.model.ModelBaseAA;
import de.ellpeck.actuallyadditions.mod.util.ModUtil;
import de.ellpeck.actuallyadditions.mod.util.PosUtil;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;
public class RenderTileEntity extends TileEntitySpecialRenderer{
public ModelBaseAA theModel;
public ResourceLocation resLoc;
public RenderTileEntity(ModelBaseAA model){
this.theModel = model;
this.resLoc = new ResourceLocation(ModUtil.MOD_ID_LOWER, "textures/blocks/models/"+this.theModel.getName()+".png");
}
@Override
public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float par5, int i){
GlStateManager.pushMatrix();
GlStateManager.translate((float)x+0.5F, (float)y-0.5F, (float)z+0.5F);
GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F);
GlStateManager.translate(0.0F, -2.0F, 0.0F);
this.bindTexture(resLoc);
if(theModel.doesRotate()){
int meta = PosUtil.getMetadata(tile.getPos(), tile.getWorld());
if(meta == 0){
GlStateManager.rotate(180F, 0F, 1F, 0F);
}
if(meta == 1){
GlStateManager.rotate(90F, 0F, 1F, 0F);
}
if(meta == 3){
GlStateManager.rotate(270F, 0F, 1F, 0F);
}
}
theModel.render(0.0625F);
theModel.renderExtra(0.0625F, tile);
GlStateManager.popMatrix();
}
}

33
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelBaseAA.java
View file

@ -1,33 +0,0 @@
/*
* This file ("ModelBaseAA.java") is part of the Actually Additions Mod for Minecraft.
* It is created and owned by Ellpeck and distributed
* under the Actually Additions License to be found at
* http://ellpeck.de/actaddlicense/
* View the source code at https://github.com/Ellpeck/ActuallyAdditions
*
* © 2016 Ellpeck
*/
package de.ellpeck.actuallyadditions.mod.blocks.render.model;
import net.minecraft.client.model.ModelBase;
import net.minecraft.tileentity.TileEntity;
public class ModelBaseAA extends ModelBase{
public void render(float f){
}
public String getName(){
return null;
}
public void renderExtra(float f, TileEntity tile){
}
public boolean doesRotate(){
return false;
}
}

115
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelBookletStand.java
View file

@ -1,115 +0,0 @@
/*
* This file ("ModelBookletStand.java") is part of the Actually Additions Mod for Minecraft.
* It is created and owned by Ellpeck and distributed
* under the Actually Additions License to be found at
* http://ellpeck.de/actaddlicense/
* View the source code at https://github.com/Ellpeck/ActuallyAdditions
*
* © 2016 Ellpeck
*/
package de.ellpeck.actuallyadditions.mod.blocks.render.model;
import net.minecraft.client.model.ModelRenderer;
public class ModelBookletStand extends ModelBaseAA{
ModelRenderer body1;
ModelRenderer bottom1;
ModelRenderer bottom2;
ModelRenderer body2;
ModelRenderer body3;
ModelRenderer book1;
ModelRenderer book2;
ModelRenderer book3;
ModelRenderer book4;
public ModelBookletStand(){
textureWidth = 64;
textureHeight = 64;
body1 = new ModelRenderer(this, 0, 0);
body1.addBox(0F, 0F, 0F, 14, 8, 1);
body1.setRotationPoint(-7F, 17F, 1F);
body1.setTextureSize(64, 64);
body1.mirror = true;
setRotation(body1, -0.7853982F, 0F, 0F);
bottom1 = new ModelRenderer(this, 25, 6);
bottom1.addBox(0F, 0F, 0F, 1, 1, 8);
bottom1.setRotationPoint(-5F, 23F, -5F);
bottom1.setTextureSize(64, 64);
bottom1.mirror = true;
setRotation(bottom1, 0F, 0F, 0F);
bottom2 = new ModelRenderer(this, 25, 6);
bottom2.addBox(0F, 0F, 0F, 1, 1, 8);
bottom2.setRotationPoint(4F, 23F, -5F);
bottom2.setTextureSize(64, 64);
bottom2.mirror = true;
setRotation(bottom2, 0F, 0F, 0F);
body2 = new ModelRenderer(this, 0, 10);
body2.addBox(0F, 0F, 0F, 14, 1, 2);
body2.setRotationPoint(-7F, 20.91F, -5F);
body2.setTextureSize(64, 64);
body2.mirror = true;
setRotation(body2, -0.7853982F, 0F, 0F);
body3 = new ModelRenderer(this, 0, 14);
body3.addBox(0F, 0F, 0F, 10, 3, 1);
body3.setRotationPoint(-5F, 20F, -1F);
body3.setTextureSize(64, 64);
body3.mirror = true;
setRotation(body3, 0F, 0F, 0F);
book1 = new ModelRenderer(this, 36, 0);
book1.addBox(0F, 0F, 0F, 8, 10, 0);
book1.setRotationPoint(0F, 15F, 3.1F);
book1.setTextureSize(64, 64);
book1.mirror = true;
setRotation(book1, -0.837758F, 0.0872665F, 0F);
book2 = new ModelRenderer(this, 36, 0);
book2.addBox(0F, 0F, 0F, 8, 10, 0);
book2.setRotationPoint(-8F, 15F, 3.1F);
book2.setTextureSize(64, 64);
book2.mirror = true;
setRotation(book2, -0.837758F, 0F, 0F);
book3 = new ModelRenderer(this, 0, 19);
book3.addBox(0F, 0F, 0F, 7, 8, 1);
book3.setRotationPoint(7F, 16F, 1.2F);
book3.setTextureSize(64, 64);
book3.mirror = true;
setRotation(book3, 0.837758F, -3.054326F, 0F);
book4 = new ModelRenderer(this, 0, 19);
book4.addBox(0F, 0F, 0F, 7, 8, 1);
book4.setRotationPoint(-7F, 15.3F, 1.2F);
book4.setTextureSize(64, 64);
book4.mirror = true;
setRotation(book4, -0.837758F, 0F, 0F);
}
private void setRotation(ModelRenderer model, float x, float y, float z){
model.rotateAngleX = x;
model.rotateAngleY = y;
model.rotateAngleZ = z;
}
@Override
public void render(float f){
body1.render(f);
bottom1.render(f);
bottom2.render(f);
body2.render(f);
body3.render(f);
book1.render(f);
book2.render(f);
book3.render(f);
book4.render(f);
}
@Override
public String getName(){
return "modelBookletStand";
}
@Override
public boolean doesRotate(){
return true;
}
}

151
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelCoffeeMachine.java
View file

@ -1,151 +0,0 @@
/*
* This file ("ModelCoffeeMachine.java") is part of the Actually Additions Mod for Minecraft.
* It is created and owned by Ellpeck and distributed
* under the Actually Additions License to be found at
* http://ellpeck.de/actaddlicense/
* View the source code at https://github.com/Ellpeck/ActuallyAdditions
*
* © 2016 Ellpeck
*/
package de.ellpeck.actuallyadditions.mod.blocks.render.model;
import net.minecraft.client.model.ModelRenderer;
/**
* Made by Canitzp.
* Thanks.
*/
public class ModelCoffeeMachine extends ModelBaseAA{
ModelRenderer p1;
ModelRenderer p2;
ModelRenderer p3;
ModelRenderer p4;
ModelRenderer p5;
ModelRenderer p6;
ModelRenderer p7;
ModelRenderer p8;
ModelRenderer p9;
ModelRenderer p10;
ModelRenderer p11;
ModelRenderer p12;
ModelRenderer p13;
public ModelCoffeeMachine(){
textureWidth = 128;
textureHeight = 128;
p1 = new ModelRenderer(this, 0, 0);
p1.addBox(0F, 0F, 0F, 10, 1, 14);
p1.setRotationPoint(-5F, 23F, -7F);
p1.setTextureSize(128, 128);
p1.mirror = true;
setRotation(p1, 0F, 0F, 0F);
p2 = new ModelRenderer(this, 49, 0);
p2.addBox(0F, 0F, 0F, 10, 8, 6);
p2.setRotationPoint(-5F, 15F, 1F);
p2.setTextureSize(128, 128);
p2.mirror = true;
setRotation(p2, 0F, 0F, 0F);
p3 = new ModelRenderer(this, 0, 16);
p3.addBox(0F, 0F, 0F, 10, 2, 11);
p3.setRotationPoint(-5F, 13F, -4F);
p3.setTextureSize(128, 128);
p3.mirror = true;
setRotation(p3, 0F, 0F, 0F);
p4 = new ModelRenderer(this, 43, 16);
p4.addBox(0F, 0F, 0F, 8, 3, 8);
p4.setRotationPoint(-4F, 10F, -1F);
p4.setTextureSize(128, 128);
p4.mirror = true;
setRotation(p4, 0F, 0F, 0F);
p5 = new ModelRenderer(this, 0, 30);
p5.addBox(0F, 0F, 0F, 2, 1, 2);
p5.setRotationPoint(-1F, 15F, -3.5F);
p5.setTextureSize(128, 128);
p5.mirror = true;
setRotation(p5, 0F, 0F, 0F);
p6 = new ModelRenderer(this, 82, 0);
p6.addBox(0F, 0F, 0F, 4, 5, 1);
p6.setRotationPoint(-2F, 17F, -1F);
p6.setTextureSize(128, 128);
p6.mirror = true;
setRotation(p6, 0F, 0F, 0F);
p7 = new ModelRenderer(this, 82, 0);
p7.addBox(0F, 0F, 0F, 4, 5, 1);
p7.setRotationPoint(-2F, 17F, -6F);
p7.setTextureSize(128, 128);
p7.mirror = true;
setRotation(p7, 0F, 0F, 0F);
p8 = new ModelRenderer(this, 82, 0);
p8.addBox(0F, 0F, 0F, 4, 5, 1);
p8.setRotationPoint(2F, 17F, -1F);
p8.setTextureSize(128, 128);
p8.mirror = true;
setRotation(p8, 0F, 1.570796F, 0F);
p9 = new ModelRenderer(this, 82, 0);
p9.addBox(0F, 0F, 0F, 4, 5, 1);
p9.setRotationPoint(-3F, 17F, -1F);
p9.setTextureSize(128, 128);
p9.mirror = true;
setRotation(p9, 0F, 1.570796F, 0F);
p10 = new ModelRenderer(this, 93, 0);
p10.addBox(0F, 0F, 0F, 4, 1, 4);
p10.setRotationPoint(-2F, 22F, -5F);
p10.setTextureSize(128, 128);
p10.mirror = true;
setRotation(p10, 0F, 0F, 0F);
p11 = new ModelRenderer(this, 82, 7);
p11.addBox(0F, 0F, 0F, 1, 1, 2);
p11.setRotationPoint(-4F, 18F, -4F);
p11.setTextureSize(128, 128);
p11.mirror = true;
setRotation(p11, 0F, 0F, 0F);
p12 = new ModelRenderer(this, 82, 7);
p12.addBox(0F, 0F, 0F, 1, 1, 2);
p12.setRotationPoint(-4F, 21F, -4F);
p12.setTextureSize(128, 128);
p12.mirror = true;
setRotation(p12, 0F, 0F, 0F);
p13 = new ModelRenderer(this, 89, 7);
p13.addBox(0F, 0F, 0F, 1, 2, 2);
p13.setRotationPoint(-5F, 19F, -4F);
p13.setTextureSize(128, 128);
p13.mirror = true;
setRotation(p13, 0F, 0F, 0F);
}
private void setRotation(ModelRenderer model, float x, float y, float z){
model.rotateAngleX = x;
model.rotateAngleY = y;
model.rotateAngleZ = z;
}
@Override
public void render(float f){
p1.render(f);
p2.render(f);
p3.render(f);
p4.render(f);
p5.render(f);
p6.render(f);
p7.render(f);
p8.render(f);
p9.render(f);
p10.render(f);
p11.render(f);
p12.render(f);
p13.render(f);
}
@Override
public String getName(){
return "modelCoffeeMachine";
}
@Override
public boolean doesRotate(){
return true;
}
}

20
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelCompost.java
View file

@ -10,17 +10,12 @@
package de.ellpeck.actuallyadditions.mod.blocks.render.model;
import de.ellpeck.actuallyadditions.mod.items.InitItems;
import de.ellpeck.actuallyadditions.mod.tile.TileEntityCompost;
import net.minecraft.client.Minecraft;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.client.model.ModelBase;
public class ModelCompost extends ModelBaseAA{
//TODO Fix compost rendering
public class ModelCompost extends ModelBase{
public ModelRenderer floor;
/*public ModelRenderer floor;
public ModelRenderer wallOne;
public ModelRenderer wallTwo;
public ModelRenderer wallThree;
@ -67,11 +62,6 @@ public class ModelCompost extends ModelBaseAA{
this.floor.render(f);
}
@Override
public String getName(){
return "modelCompost";
}
@Override
public void renderExtra(float f, TileEntity tile){
//Hehe
@ -95,5 +85,5 @@ public class ModelCompost extends ModelBaseAA{
}
}
}
}
}*/
}

119
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelFishingNet.java
View file

@ -1,119 +0,0 @@
/*
* This file ("ModelFishingNet.java") is part of the Actually Additions Mod for Minecraft.
* It is created and owned by Ellpeck and distributed
* under the Actually Additions License to be found at
* http://ellpeck.de/actaddlicense/
* View the source code at https://github.com/Ellpeck/ActuallyAdditions
*
* © 2016 Ellpeck
*/
package de.ellpeck.actuallyadditions.mod.blocks.render.model;
import net.minecraft.client.model.ModelRenderer;
public class ModelFishingNet extends ModelBaseAA{
public ModelRenderer s1;
public ModelRenderer s2;
public ModelRenderer s3;
public ModelRenderer s4;
public ModelRenderer s5;
public ModelRenderer s6;
public ModelRenderer s7;
public ModelRenderer s8;
public ModelRenderer s9;
public ModelRenderer s10;
public ModelRenderer s11;
public ModelRenderer s12;
public ModelRenderer s13;
public ModelRenderer s14;
public ModelRenderer s15;
public ModelRenderer s16;
public ModelFishingNet(){
this.textureWidth = 64;
this.textureHeight = 64;
this.s11 = new ModelRenderer(this, 0, 0);
this.s11.mirror = true;
this.s11.setRotationPoint(-3.5F, 23.0F, -8.0F);
this.s11.addBox(0.0F, 0.0F, 0.0F, 1, 1, 16, 0.0F);
this.s9 = new ModelRenderer(this, 0, 0);
this.s9.mirror = true;
this.s9.setRotationPoint(-7.5F, 23.0F, -8.0F);
this.s9.addBox(0.0F, 0.0F, 0.0F, 1, 1, 16, 0.0F);
this.s8 = new ModelRenderer(this, 0, 0);
this.s8.setRotationPoint(-8.0F, 23.0F, 6.5F);
this.s8.addBox(0.0F, 0.0F, 0.0F, 16, 1, 1, 0.0F);
this.s3 = new ModelRenderer(this, 0, 0);
this.s3.setRotationPoint(-8.0F, 23.0F, -3.5F);
this.s3.addBox(0.0F, 0.0F, 0.0F, 16, 1, 1, 0.0F);
this.s1 = new ModelRenderer(this, 0, 0);
this.s1.setRotationPoint(-8.0F, 23.0F, -7.5F);
this.s1.addBox(0.0F, 0.0F, 0.0F, 16, 1, 1, 0.0F);
this.s14 = new ModelRenderer(this, 0, 0);
this.s14.mirror = true;
this.s14.setRotationPoint(2.5F, 23.0F, -8.0F);
this.s14.addBox(0.0F, 0.0F, 0.0F, 1, 1, 16, 0.0F);
this.s15 = new ModelRenderer(this, 0, 0);
this.s15.mirror = true;
this.s15.setRotationPoint(4.5F, 23.0F, -8.0F);
this.s15.addBox(0.0F, 0.0F, 0.0F, 1, 1, 16, 0.0F);
this.s4 = new ModelRenderer(this, 0, 0);
this.s4.setRotationPoint(-8.0F, 23.0F, -1.5F);
this.s4.addBox(0.0F, 0.0F, 0.0F, 16, 1, 1, 0.0F);
this.s13 = new ModelRenderer(this, 0, 0);
this.s13.mirror = true;
this.s13.setRotationPoint(0.5F, 23.0F, -8.0F);
this.s13.addBox(0.0F, 0.0F, 0.0F, 1, 1, 16, 0.0F);
this.s5 = new ModelRenderer(this, 0, 0);
this.s5.setRotationPoint(-8.0F, 23.0F, 0.5F);
this.s5.addBox(0.0F, 0.0F, 0.0F, 16, 1, 1, 0.0F);
this.s6 = new ModelRenderer(this, 0, 0);
this.s6.setRotationPoint(-8.0F, 23.0F, 2.5F);
this.s6.addBox(0.0F, 0.0F, 0.0F, 16, 1, 1, 0.0F);
this.s12 = new ModelRenderer(this, 0, 0);
this.s12.mirror = true;
this.s12.setRotationPoint(-1.5F, 23.0F, -8.0F);
this.s12.addBox(0.0F, 0.0F, 0.0F, 1, 1, 16, 0.0F);
this.s16 = new ModelRenderer(this, 0, 0);
this.s16.mirror = true;
this.s16.setRotationPoint(6.5F, 23.0F, -8.0F);
this.s16.addBox(0.0F, 0.0F, 0.0F, 1, 1, 16, 0.0F);
this.s2 = new ModelRenderer(this, 0, 0);
this.s2.setRotationPoint(-8.0F, 23.0F, -5.5F);
this.s2.addBox(0.0F, 0.0F, 0.0F, 16, 1, 1, 0.0F);
this.s7 = new ModelRenderer(this, 0, 0);
this.s7.setRotationPoint(-8.0F, 23.0F, 4.5F);
this.s7.addBox(0.0F, 0.0F, 0.0F, 16, 1, 1, 0.0F);
this.s10 = new ModelRenderer(this, 0, 0);
this.s10.mirror = true;
this.s10.setRotationPoint(-5.5F, 23.0F, -8.0F);
this.s10.addBox(0.0F, 0.0F, 0.0F, 1, 1, 16, 0.0F);
}
@Override
public void render(float f){
this.s11.render(f);
this.s9.render(f);
this.s8.render(f);
this.s3.render(f);
this.s1.render(f);
this.s14.render(f);
this.s15.render(f);
this.s4.render(f);
this.s13.render(f);
this.s5.render(f);
this.s6.render(f);
this.s12.render(f);
this.s16.render(f);
this.s2.render(f);
this.s7.render(f);
this.s10.render(f);
}
@Override
public String getName(){
return "modelFishingNet";
}
}

36
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelFurnaceSolar.java
View file

@ -1,36 +0,0 @@
/*
* This file ("ModelFurnaceSolar.java") is part of the Actually Additions Mod for Minecraft.
* It is created and owned by Ellpeck and distributed
* under the Actually Additions License to be found at
* http://ellpeck.de/actaddlicense/
* View the source code at https://github.com/Ellpeck/ActuallyAdditions
*
* © 2016 Ellpeck
*/
package de.ellpeck.actuallyadditions.mod.blocks.render.model;
import net.minecraft.client.model.ModelRenderer;
public class ModelFurnaceSolar extends ModelBaseAA{
public ModelRenderer s;
public ModelFurnaceSolar(){
this.textureWidth = 64;
this.textureHeight = 32;
this.s = new ModelRenderer(this, 0, 0);
this.s.setRotationPoint(-8.0F, 21.0F, -8.0F);
this.s.addBox(0.0F, 0.0F, 0.0F, 16, 3, 16, 0.0F);
}
@Override
public void render(float f){
this.s.render(f);
}
@Override
public String getName(){
return "modelFurnaceSolar";
}
}

187
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelLaserRelay.java
View file

@ -1,187 +0,0 @@
/*
* This file ("ModelLaserRelay.java") is part of the Actually Additions Mod for Minecraft.
* It is created and owned by Ellpeck and distributed
* under the Actually Additions License to be found at
* http://ellpeck.de/actaddlicense/
* View the source code at https://github.com/Ellpeck/ActuallyAdditions
*
* © 2016 Ellpeck
*/
package de.ellpeck.actuallyadditions.mod.blocks.render.model;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.client.renderer.GlStateManager;
import org.lwjgl.opengl.GL11;
/**
* Made by Canitzp.
* Thanks. Seriously. It looks really awesome. I don't think I could do this.
*/
public class ModelLaserRelay extends ModelBaseAA{
ModelRenderer bottom;
ModelRenderer laserPillar;
ModelRenderer laserBase;
ModelRenderer covering1;
ModelRenderer covering2;
ModelRenderer covering3;
ModelRenderer covering4;
ModelRenderer covering5;
ModelRenderer covering6;
ModelRenderer covering7;
ModelRenderer covering8;
ModelRenderer top;
ModelRenderer covering9;
ModelRenderer covering10;
ModelRenderer covering11;
ModelRenderer covering12;
ModelRenderer energyBall;
public ModelLaserRelay(){
textureWidth = 64;
textureHeight = 64;
bottom = new ModelRenderer(this, 0, 0);
bottom.addBox(0F, 0F, 0F, 8, 1, 8);
bottom.setRotationPoint(-4F, 23F, -4F);
bottom.setTextureSize(64, 64);
bottom.mirror = true;
setRotation(bottom, 0F, 0F, 0F);
laserPillar = new ModelRenderer(this, 54, 0);
laserPillar.addBox(0F, 0F, 0F, 2, 11, 2);
laserPillar.setRotationPoint(-1F, 10F, -1F);
laserPillar.setTextureSize(64, 64);
laserPillar.mirror = true;
setRotation(laserPillar, 0F, 0F, 0F);
laserBase = new ModelRenderer(this, 33, 0);
laserBase.addBox(0F, 0F, 0F, 5, 2, 5);
laserBase.setRotationPoint(-2.5F, 21F, -2.5F);
laserBase.setTextureSize(64, 64);
laserBase.mirror = true;
setRotation(laserBase, 0F, 0F, 0F);
covering1 = new ModelRenderer(this, 0, 10);
covering1.addBox(0F, 0F, 0F, 8, 3, 1);
covering1.setRotationPoint(-4F, 20F, -5F);
covering1.setTextureSize(64, 64);
covering1.mirror = true;
setRotation(covering1, 0F, 0F, 0F);
covering2 = new ModelRenderer(this, 0, 10);
covering2.addBox(0F, 0F, 0F, 8, 3, 1);
covering2.setRotationPoint(-4F, 20F, 4F);
covering2.setTextureSize(64, 64);
covering2.mirror = true;
setRotation(covering2, 0F, 0F, 0F);
covering3 = new ModelRenderer(this, 0, 10);
covering3.addBox(0F, 0F, 0F, 8, 3, 1);
covering3.setRotationPoint(-5F, 20F, 4F);
covering3.setTextureSize(64, 64);
covering3.mirror = true;
setRotation(covering3, 0F, 1.579523F, 0F);
covering4 = new ModelRenderer(this, 0, 10);
covering4.addBox(0F, 0F, 0F, 8, 3, 1);
covering4.setRotationPoint(4F, 20F, 4F);
covering4.setTextureSize(64, 64);
covering4.mirror = true;
setRotation(covering4, 0F, 1.579523F, 0F);
covering5 = new ModelRenderer(this, 0, 10);
covering5.addBox(0F, 0F, 0F, 8, 3, 1);
covering5.setRotationPoint(-4F, 10F, -5F);
covering5.setTextureSize(64, 64);
covering5.mirror = true;
setRotation(covering5, 0F, 0F, 0F);
covering6 = new ModelRenderer(this, 0, 10);
covering6.addBox(0F, 0F, 0F, 8, 3, 1);
covering6.setRotationPoint(-4F, 10F, 4F);
covering6.setTextureSize(64, 64);
covering6.mirror = true;
setRotation(covering6, 0F, 0F, 0F);
covering7 = new ModelRenderer(this, 0, 10);
covering7.addBox(0F, 0F, 0F, 8, 3, 1);
covering7.setRotationPoint(-5F, 10F, 4F);
covering7.setTextureSize(64, 64);
covering7.mirror = true;
setRotation(covering7, 0F, 1.579523F, 0F);
covering8 = new ModelRenderer(this, 0, 10);
covering8.addBox(0F, 0F, 0F, 8, 3, 1);
covering8.setRotationPoint(4F, 10F, 4F);
covering8.setTextureSize(64, 64);
covering8.mirror = true;
setRotation(covering8, 0F, 1.579523F, 0F);
top = new ModelRenderer(this, 0, 0);
top.addBox(0F, 0F, 0F, 8, 1, 8);
top.setRotationPoint(-4F, 9F, -4F);
top.setTextureSize(64, 64);
top.mirror = true;
setRotation(top, 0F, 0F, 0F);
covering9 = new ModelRenderer(this, 19, 10);
covering9.addBox(0F, 0F, 0F, 8, 7, 1);
covering9.setRotationPoint(-4F, 13F, 5F);
covering9.setTextureSize(64, 64);
covering9.mirror = true;
setRotation(covering9, 0F, 0F, 0F);
covering10 = new ModelRenderer(this, 19, 10);
covering10.addBox(0F, 0F, 0F, 8, 7, 1);
covering10.setRotationPoint(-4F, 13F, -6F);
covering10.setTextureSize(64, 64);
covering10.mirror = true;
setRotation(covering10, 0F, 0F, 0F);
covering11 = new ModelRenderer(this, 19, 10);
covering11.addBox(0F, 0F, 0F, 8, 7, 1);
covering11.setRotationPoint(-6F, 13F, 4F);
covering11.setTextureSize(64, 64);
covering11.mirror = true;
setRotation(covering11, 0F, 1.579523F, 0F);
covering12 = new ModelRenderer(this, 19, 10);
covering12.addBox(0F, 0F, 0F, 8, 7, 1);
covering12.setRotationPoint(5F, 13F, 4F);
covering12.setTextureSize(64, 64);
covering12.mirror = true;
setRotation(covering12, 0F, 1.579523F, 0F);
energyBall = new ModelRenderer(this, 0, 15);
energyBall.addBox(0F, 0F, 0F, 3, 3, 3);
energyBall.setRotationPoint(-1.5F, 15F, -1.5F);
energyBall.setTextureSize(64, 64);
energyBall.mirror = true;
setRotation(energyBall, 0F, 0F, 0F);
}
private void setRotation(ModelRenderer model, float x, float y, float z){
model.rotateAngleX = x;
model.rotateAngleY = y;
model.rotateAngleZ = z;
}
@Override
public void render(float f){
GlStateManager.enableBlend();
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
bottom.render(f);
laserPillar.render(f);
laserBase.render(f);
energyBall.render(f);
top.render(f);
covering1.render(f);
covering2.render(f);
covering3.render(f);
covering4.render(f);
covering5.render(f);
covering6.render(f);
covering7.render(f);
covering8.render(f);
covering9.render(f);
covering10.render(f);
covering11.render(f);
covering12.render(f);
}
@Override
public String getName(){
return "modelLaserRelay";
}
@Override
public boolean doesRotate(){
return true;
}
}

163
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelPhantomBooster.java
View file

@ -1,163 +0,0 @@
/*
* This file ("ModelPhantomBooster.java") is part of the Actually Additions Mod for Minecraft.
* It is created and owned by Ellpeck and distributed
* under the Actually Additions License to be found at
* http://ellpeck.de/actaddlicense/
* View the source code at https://github.com/Ellpeck/ActuallyAdditions
*
* © 2016 Ellpeck
*/
package de.ellpeck.actuallyadditions.mod.blocks.render.model;
import net.minecraft.client.model.ModelRenderer;
public class ModelPhantomBooster extends ModelBaseAA{
ModelRenderer s1;
ModelRenderer s2;
ModelRenderer s3;
ModelRenderer s4;
ModelRenderer s5;
ModelRenderer s6;
ModelRenderer s7;
ModelRenderer s8;
ModelRenderer s9;
ModelRenderer s10;
ModelRenderer s11;
ModelRenderer s12;
ModelRenderer s13;
ModelRenderer s14;
ModelRenderer s15;
public ModelPhantomBooster(){
textureWidth = 128;
textureHeight = 128;
s1 = new ModelRenderer(this, 0, 0);
s1.addBox(0F, 0F, 0F, 4, 16, 4);
s1.setRotationPoint(-2F, 8F, -2F);
s1.setTextureSize(128, 128);
s1.mirror = true;
setRotation(s1, 0F, 0F, 0F);
s2 = new ModelRenderer(this, 17, 0);
s2.addBox(0F, 0F, 0F, 6, 1, 6);
s2.setRotationPoint(-3F, 9F, -3F);
s2.setTextureSize(128, 128);
s2.mirror = true;
setRotation(s2, 0F, 0F, 0F);
s3 = new ModelRenderer(this, 17, 0);
s3.addBox(0F, 0F, 0F, 6, 1, 6);
s3.setRotationPoint(-3F, 22F, -3F);
s3.setTextureSize(128, 128);
s3.mirror = true;
setRotation(s3, 0F, 0F, 0F);
s4 = new ModelRenderer(this, 17, 8);
s4.addBox(0F, 0F, 0F, 6, 2, 1);
s4.setRotationPoint(-3F, 10F, -4F);
s4.setTextureSize(128, 128);
s4.mirror = true;
setRotation(s4, 0F, 0F, 0F);
s5 = new ModelRenderer(this, 17, 8);
s5.addBox(0F, 0F, 0F, 6, 2, 1);
s5.setRotationPoint(-3F, 10F, 3F);
s5.setTextureSize(128, 128);
s5.mirror = true;
setRotation(s5, 0F, 0F, 0F);
s6 = new ModelRenderer(this, 17, 8);
s6.addBox(0F, 0F, 0F, 6, 2, 1);
s6.setRotationPoint(-4F, 10F, 3F);
s6.setTextureSize(128, 128);
s6.mirror = true;
setRotation(s6, 0F, 1.579523F, 0F);
s7 = new ModelRenderer(this, 17, 8);
s7.addBox(0F, 0F, 0F, 6, 2, 1);
s7.setRotationPoint(3F, 10F, 3F);
s7.setTextureSize(128, 128);
s7.mirror = true;
setRotation(s7, 0F, 1.579523F, 0F);
s8 = new ModelRenderer(this, 17, 12);
s8.addBox(0F, 0F, 0F, 6, 8, 1);
s8.setRotationPoint(-3F, 12F, -5F);
s8.setTextureSize(128, 128);
s8.mirror = true;
setRotation(s8, 0F, 0F, 0F);
s9 = new ModelRenderer(this, 17, 12);
s9.addBox(0F, 0F, 0F, 6, 8, 1);
s9.setRotationPoint(-3F, 12F, 4F);
s9.setTextureSize(128, 128);
s9.mirror = true;
setRotation(s9, 0F, 0F, 0F);
s10 = new ModelRenderer(this, 17, 12);
s10.addBox(0F, 0F, 0F, 6, 8, 1);
s10.setRotationPoint(-5F, 12F, 3F);
s10.setTextureSize(128, 128);
s10.mirror = true;
setRotation(s10, 0F, 1.579523F, 0F);
s11 = new ModelRenderer(this, 17, 12);
s11.addBox(0F, 0F, 0F, 6, 8, 1);
s11.setRotationPoint(4F, 12F, 3F);
s11.setTextureSize(128, 128);
s11.mirror = true;
setRotation(s11, 0F, 1.579523F, 0F);
s12 = new ModelRenderer(this, 17, 8);
s12.addBox(0F, 0F, 0F, 6, 2, 1);
s12.setRotationPoint(-4F, 20F, 3F);
s12.setTextureSize(128, 128);
s12.mirror = true;
setRotation(s12, 0F, 1.579523F, 0F);
s13 = new ModelRenderer(this, 17, 8);
s13.addBox(0F, 0F, 0F, 6, 2, 1);
s13.setRotationPoint(-3F, 20F, 3F);
s13.setTextureSize(128, 128);
s13.mirror = true;
setRotation(s13, 0F, 0F, 0F);
s14 = new ModelRenderer(this, 17, 8);
s14.addBox(0F, 0F, 0F, 6, 2, 1);
s14.setRotationPoint(3F, 20F, 3F);
s14.setTextureSize(128, 128);
s14.mirror = true;
setRotation(s14, 0F, 1.579523F, 0F);
s15 = new ModelRenderer(this, 17, 8);
s15.addBox(0F, 0F, 0F, 6, 2, 1);
s15.setRotationPoint(-3F, 20F, -4F);
s15.setTextureSize(128, 128);
s15.mirror = true;
setRotation(s15, 0F, 0F, 0F);
}
private void setRotation(ModelRenderer model, float x, float y, float z){
model.rotateAngleX = x;
model.rotateAngleY = y;
model.rotateAngleZ = z;
}
@Override
public void render(float f){
s1.render(f);
s2.render(f);
s3.render(f);
s4.render(f);
s5.render(f);
s6.render(f);
s7.render(f);
s8.render(f);
s9.render(f);
s10.render(f);
s11.render(f);
s12.render(f);
s13.render(f);
s14.render(f);
s15.render(f);
}
@Override
public String getName(){
return "modelPhantomBooster";
}
@Override
public boolean doesRotate(){
return true;
}
}

171
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelSmileyCloud.java
View file

@ -1,171 +0,0 @@
/*
* This file ("ModelSmileyCloud.java") is part of the Actually Additions Mod for Minecraft.
* It is created and owned by Ellpeck and distributed
* under the Actually Additions License to be found at
* http://ellpeck.de/actaddlicense/
* View the source code at https://github.com/Ellpeck/ActuallyAdditions
*
* © 2016 Ellpeck
*/
package de.ellpeck.actuallyadditions.mod.blocks.render.model;
import net.minecraft.client.model.ModelRenderer;
public class ModelSmileyCloud extends ModelBaseAA{
ModelRenderer s1;
ModelRenderer s2;
ModelRenderer s3;
ModelRenderer s4;
ModelRenderer s5;
ModelRenderer s6;
ModelRenderer s7;
ModelRenderer s8;
ModelRenderer s9;
ModelRenderer s10;
ModelRenderer s11;
ModelRenderer s12;
ModelRenderer s13;
ModelRenderer s14;
ModelRenderer s15;
ModelRenderer s16;
public ModelSmileyCloud(){
textureWidth = 64;
textureHeight = 64;
s1 = new ModelRenderer(this, 0, 0);
s1.addBox(0F, 0F, 0F, 12, 10, 10);
s1.setRotationPoint(-6F, 14F, -4F);
s1.setTextureSize(64, 64);
s1.mirror = true;
setRotation(s1, 0F, 0F, 0F);
s2 = new ModelRenderer(this, 45, 0);
s2.addBox(0F, 0F, 0F, 1, 8, 8);
s2.setRotationPoint(-7F, 15F, -3F);
s2.setTextureSize(64, 64);
s2.mirror = true;
setRotation(s2, 0F, 0F, 0F);
s3 = new ModelRenderer(this, 45, 0);
s3.addBox(0F, 0F, 0F, 1, 8, 8);
s3.setRotationPoint(6F, 15F, -3F);
s3.setTextureSize(64, 64);
s3.mirror = true;
setRotation(s3, 0F, 0F, 0F);
s4 = new ModelRenderer(this, 0, 21);
s4.addBox(0F, 0F, 0F, 10, 8, 1);
s4.setRotationPoint(-5F, 15F, 6F);
s4.setTextureSize(64, 64);
s4.mirror = true;
setRotation(s4, 0F, 0F, 0F);
s5 = new ModelRenderer(this, 23, 27);
s5.addBox(0F, 0F, 0F, 10, 1, 8);
s5.setRotationPoint(-5F, 13F, -3F);
s5.setTextureSize(64, 64);
s5.mirror = true;
setRotation(s5, 0F, 0F, 0F);
s6 = new ModelRenderer(this, 23, 21);
s6.addBox(0F, 0F, 0F, 6, 1, 4);
s6.setRotationPoint(-3F, 12F, -1F);
s6.setTextureSize(64, 64);
s6.mirror = true;
setRotation(s6, 0F, 0F, 0F);
s7 = new ModelRenderer(this, 45, 16);
s7.addBox(0F, 0F, 0F, 6, 6, 1);
s7.setRotationPoint(-3F, 16F, 7F);
s7.setTextureSize(64, 64);
s7.mirror = true;
setRotation(s7, 0F, 0F, 0F);
s8 = new ModelRenderer(this, 0, 31);
s8.addBox(0F, 0F, 0F, 1, 6, 6);
s8.setRotationPoint(-8F, 16F, -2F);
s8.setTextureSize(64, 64);
s8.mirror = true;
setRotation(s8, 0F, 0F, 0F);
s9 = new ModelRenderer(this, 0, 31);
s9.addBox(0F, 0F, 0F, 1, 6, 6);
s9.setRotationPoint(7F, 16F, -2F);
s9.setTextureSize(64, 64);
s9.mirror = true;
setRotation(s9, 0F, 0F, 0F);
s10 = new ModelRenderer(this, 15, 37);
s10.addBox(0F, 0F, 0F, 6, 1, 1);
s10.setRotationPoint(-3F, 20F, -5F);
s10.setTextureSize(64, 64);
s10.mirror = true;
setRotation(s10, 0F, 0F, 0F);
s11 = new ModelRenderer(this, 15, 31);
s11.addBox(0F, 1F, 0F, 1, 1, 1);
s11.setRotationPoint(-4F, 18F, -5F);
s11.setTextureSize(64, 64);
s11.mirror = true;
setRotation(s11, 0F, 0F, 0F);
s12 = new ModelRenderer(this, 15, 31);
s12.addBox(0F, 1F, 0F, 1, 1, 1);
s12.setRotationPoint(3F, 18F, -5F);
s12.setTextureSize(64, 64);
s12.mirror = true;
setRotation(s12, 0F, 0F, 0F);
s13 = new ModelRenderer(this, 15, 40);
s13.addBox(0F, 0F, 0F, 2, 2, 1);
s13.setRotationPoint(-3F, 15F, -4.5F);
s13.setTextureSize(64, 64);
s13.mirror = true;
setRotation(s13, 0F, 0F, 0F);
s14 = new ModelRenderer(this, 15, 40);
s14.addBox(0F, 0F, 0F, 2, 2, 1);
s14.setRotationPoint(1F, 15F, -4.5F);
s14.setTextureSize(64, 64);
s14.mirror = true;
setRotation(s14, 0F, 0F, 0F);
s15 = new ModelRenderer(this, 30, 37);
s15.addBox(0F, 0F, 0F, 1, 1, 1);
s15.setRotationPoint(-2.5F, 15.5F, -4.7F);
s15.setTextureSize(64, 64);
s15.mirror = true;
setRotation(s15, 0F, 0F, 0F);
s16 = new ModelRenderer(this, 30, 37);
s16.addBox(0F, 0F, 0F, 1, 1, 1);
s16.setRotationPoint(1.5F, 15.5F, -4.7F);
s16.setTextureSize(64, 64);
s16.mirror = true;
setRotation(s16, 0F, 0F, 0F);
}
private void setRotation(ModelRenderer model, float x, float y, float z){
model.rotateAngleX = x;
model.rotateAngleY = y;
model.rotateAngleZ = z;
}
@Override
public void render(float f){
s1.render(f);
s2.render(f);
s3.render(f);
s4.render(f);
s5.render(f);
s6.render(f);
s7.render(f);
s8.render(f);
s9.render(f);
s10.render(f);
s11.render(f);
s12.render(f);
s13.render(f);
s14.render(f);
s15.render(f);
s16.render(f);
}
@Override
public String getName(){
return "modelSmileyCloud";
}
@Override
public boolean doesRotate(){
return true;
}
}

20
src/main/java/de/ellpeck/actuallyadditions/mod/booklet/BookletUtils.java
View file

@ -191,6 +191,9 @@ public class BookletUtils{
else if(button instanceof TexturedButton){
booklet.drawHoveringText(((TexturedButton)button).textList, mouseX, mouseY);
}
else if(button instanceof IndexButton){
((IndexButton)button).drawHover(mouseX, mouseY);
}
}
}
}
@ -206,7 +209,8 @@ public class BookletUtils{
currentEntry.chapters.clear();
for(IBookletChapter chapter : currentEntry.allChapters){
if(chapter.getLocalizedName().toLowerCase(Locale.ROOT).contains(booklet.searchField.getText().toLowerCase(Locale.ROOT))){
String searchFieldText = booklet.searchField.getText().toLowerCase(Locale.ROOT);
if(chapter.getLocalizedName().toLowerCase(Locale.ROOT).contains(searchFieldText) || getChapterStacksContainString(searchFieldText, chapter)){
currentEntry.chapters.add(chapter);
}
}
@ -218,6 +222,20 @@ public class BookletUtils{
}
}
private static boolean getChapterStacksContainString(String text, IBookletChapter chapter){
for(BookletPage page : chapter.getPages()){
ItemStack[] pageStacks = page.getItemStacksForPage();
if(pageStacks != null){
for(ItemStack stack : pageStacks){
if(stack.getDisplayName().toLowerCase(Locale.ROOT).contains(text)){
return true;
}
}
}
}
return false;
}
@SuppressWarnings("unchecked")
public static void openIndexEntry(GuiBooklet booklet, IBookletEntry entry, int page, boolean resetTextField){
booklet.searchField.setVisible(entry instanceof BookletEntryAllSearch);

8
src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java
View file

@ -65,7 +65,7 @@ public class InitBooklet{
//Getting Started
chapterIntro = new BookletChapter("intro", ActuallyAdditionsAPI.entryGettingStarted, new ItemStack(InitItems.itemBooklet), new PageTextOnly(1), new PageTextOnly(2), new PageTextOnly(3));
new BookletChapter("bookTutorial", ActuallyAdditionsAPI.entryGettingStarted, new ItemStack(InitItems.itemBooklet), new PageTextOnly(1), new PageTextOnly(2), new PageCrafting(3, ItemCrafting.recipeBook));
new BookletChapter("crystals", ActuallyAdditionsAPI.entryGettingStarted, new ItemStack(InitBlocks.blockAtomicReconstructor), new PageTextOnly(1).addTextReplacement("<rf>", TileEntityAtomicReconstructor.ENERGY_USE), new PageTextOnly(2), new PageTextOnly(3), new PagePicture(4, "pageAtomicReconstructor", 0).setNoText(), new PageTextOnly(5), new PageCrafting(6, BlockCrafting.recipeAtomicReconstructor).setNoText().setPageStacksWildcard(), new PageCrafting(7, MiscCrafting.recipesCrystals).setNoText(), new PageCrafting(8, MiscCrafting.recipesCrystalBlocks).setNoText(), new PageReconstructor(9, LensNoneRecipeHandler.mainPageRecipes).setNoText()).setSpecial();
new BookletChapter("crystals", ActuallyAdditionsAPI.entryGettingStarted, new ItemStack(InitBlocks.blockAtomicReconstructor), new PageTextOnly(1).addTextReplacement("<rf>", TileEntityAtomicReconstructor.ENERGY_USE), new PageTextOnly(2), new PageTextOnly(3), new PagePicture(4, "pageAtomicReconstructor", 0).setNoText(), new PageTextOnly(5), new PageCrafting(6, BlockCrafting.recipeAtomicReconstructor).setNoText().setPageStacksWildcard(), new PageCrafting(7, MiscCrafting.recipesCrystals).setNoText(), new PageCrafting(8, MiscCrafting.recipesCrystalBlocks).setNoText(), new PageReconstructor(9, LensNoneRecipeHandler.mainPageRecipes).setNoText()).setSpecial().setIncomplete();
new BookletChapter("coalGen", ActuallyAdditionsAPI.entryGettingStarted, new ItemStack(InitBlocks.blockCoalGenerator), new PageCrafting(1, BlockCrafting.recipeCoalGen).addTextReplacement("<rf>", TileEntityCoalGenerator.PRODUCE));
new BookletChapter("craftingIngs", ActuallyAdditionsAPI.entryGettingStarted, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeCoil).setNoText(), new PageCrafting(3, ItemCrafting.recipeCoilAdvanced).setNoText(), new PageCrafting(4, BlockCrafting.recipeCase).setNoText(), new PageCrafting(5, BlockCrafting.recipeEnderPearlBlock).setNoText(), new PageCrafting(6, BlockCrafting.recipeEnderCase).setNoText(), new PageCrafting(7, ItemCrafting.recipeRing).setNoText(), new PageCrafting(8, ItemCrafting.recipeKnifeHandle).setNoText(), new PageCrafting(9, ItemCrafting.recipeKnifeBlade).setNoText(), new PageCrafting(10, ItemCrafting.recipeKnife).setNoText(), new PageCrafting(11, ItemCrafting.recipeDough).setNoText(), new PageCrafting(12, ItemCrafting.recipeRiceDough).setNoText(), new PageCrafting(13, BlockCrafting.recipeIronCase).setNoText()).setImportant();
new BookletChapter("rf", ActuallyAdditionsAPI.entryGettingStarted, new ItemStack(Items.redstone), new PageTextOnly(1));
@ -75,7 +75,7 @@ public class InitBooklet{
new BookletChapter("miscDecorStuffsAndThings", ActuallyAdditionsAPI.entryMisc, new ItemStack(InitBlocks.blockTestifiBucksGreenWall), new PageTextOnly(1), new PageReconstructor(2, LensNoneRecipeHandler.recipeWhiteWall).setNoText(), new PageReconstructor(3, LensNoneRecipeHandler.recipeGreenWall).setNoText());
new BookletChapter("bookStand", ActuallyAdditionsAPI.entryMisc, new ItemStack(InitBlocks.blockBookletStand), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeBookStand).setPageStacksWildcard());
new BookletChapter("quartz", ActuallyAdditionsAPI.entryMisc, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), new PageTextOnly(1).setStack(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ORE_QUARTZ.ordinal())).addTextReplacement("<lowest>", OreGen.QUARTZ_MIN).addTextReplacement("<highest>", OreGen.QUARTZ_MAX), new PageTextOnly(2).setStack(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal())), new PageCrafting(3, BlockCrafting.recipeQuartzBlock).setNoText(), new PageCrafting(4, BlockCrafting.recipeQuartzPillar).setNoText(), new PageCrafting(5, BlockCrafting.recipeQuartzChiseled).setNoText());
new BookletChapter("cloud", ActuallyAdditionsAPI.entryMisc, new ItemStack(InitBlocks.blockSmileyCloud), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeSmileyCloud).setNoText()).setSpecial();
new BookletChapter("cloud", ActuallyAdditionsAPI.entryMisc, new ItemStack(InitBlocks.blockSmileyCloud), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeSmileyCloud).setNoText()).setSpecial().setIncomplete();
new BookletChapter("coalStuff", ActuallyAdditionsAPI.entryMisc, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.TINY_COAL.ordinal()), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeTinyCoal).setNoText(), new PageCrafting(3, ItemCrafting.recipeTinyChar).setNoText(), new PageCrafting(4, BlockCrafting.recipeBlockChar).setNoText());
ArrayList<BookletPage> lampPages = new ArrayList<BookletPage>();
lampPages.add(new PageTextOnly(lampPages.size()+1));
@ -99,7 +99,7 @@ public class InitBooklet{
new BookletChapter("greenhouseGlass", ActuallyAdditionsAPI.entryFunctionalNonRF, new ItemStack(InitBlocks.blockGreenhouseGlass), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeGlass));
new BookletChapter("fishingNet", ActuallyAdditionsAPI.entryFunctionalNonRF, new ItemStack(InitBlocks.blockFishingNet), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeFisher).setNoText());
new BookletChapter("feeder", ActuallyAdditionsAPI.entryFunctionalNonRF, new ItemStack(InitBlocks.blockFeeder), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeFeeder).setNoText());
new BookletChapter("compost", ActuallyAdditionsAPI.entryFunctionalNonRF, new ItemStack(InitBlocks.blockCompost), new PageTextOnly(1).setStack(new ItemStack(InitItems.itemFertilizer)).addTextReplacement("<num>", TileEntityCompost.AMOUNT), new PageCrafting(2, BlockCrafting.recipeCompost).setNoText(), new PageCrafting(3, ItemCrafting.recipesMashedFood));
new BookletChapter("compost", ActuallyAdditionsAPI.entryFunctionalNonRF, new ItemStack(InitBlocks.blockCompost), new PageTextOnly(1).setStack(new ItemStack(InitItems.itemFertilizer)).addTextReplacement("<num>", TileEntityCompost.AMOUNT), new PageCrafting(2, BlockCrafting.recipeCompost).setNoText(), new PageCrafting(3, ItemCrafting.recipesMashedFood)).setIncomplete();
new BookletChapter("crate", ActuallyAdditionsAPI.entryFunctionalNonRF, new ItemStack(InitBlocks.blockGiantChest), new PageCrafting(1, BlockCrafting.recipeCrate), new PageCrafting(2, ItemCrafting.recipeCrateKeeper), new PageCrafting(3, ItemCrafting.recipeChestToCrateUpgrade));
new BookletChapter("rangedCollector", ActuallyAdditionsAPI.entryFunctionalNonRF, new ItemStack(InitBlocks.blockRangedCollector), new PageTextOnly(1).addTextReplacement("<range>", TileEntityRangedCollector.RANGE), new PageCrafting(2, BlockCrafting.recipeRangedCollector).setNoText());
@ -132,7 +132,7 @@ public class InitBooklet{
}
new BookletChapter("aiots", ActuallyAdditionsAPI.entryItemsNonRF, new ItemStack(InitItems.emeraldPaxel), aiotPages.toArray(new BookletPage[aiotPages.size()])).setImportant();
new BookletChapter("jams", ActuallyAdditionsAPI.entryItemsNonRF, new ItemStack(InitItems.itemJams), new PageTextOnly(1).setStack(new ItemStack(InitItems.itemJams, 1, Util.WILDCARD)), new PagePicture(2, "pageJamHouse", 150), new PageTextOnly(3));
new BookletChapter("jams", ActuallyAdditionsAPI.entryItemsNonRF, new ItemStack(InitItems.itemJams), new PageTextOnly(1).setStack(new ItemStack(InitItems.itemJams, 1, Util.WILDCARD)), new PagePicture(2, "pageJamHouse", 150), new PageTextOnly(3)).setIncomplete();
ArrayList<BookletPage> potionRingPages = new ArrayList<BookletPage>();
potionRingPages.add(new PageTextOnly(potionRingPages.size()+1));

10
src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/IndexButton.java
View file

@ -12,10 +12,14 @@ package de.ellpeck.actuallyadditions.mod.booklet.button;
import de.ellpeck.actuallyadditions.api.booklet.IBookletChapter;
import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet;
import de.ellpeck.actuallyadditions.mod.booklet.chapter.BookletChapter;
import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
import de.ellpeck.actuallyadditions.mod.util.ModUtil;
import de.ellpeck.actuallyadditions.mod.util.StringUtil;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.util.EnumChatFormatting;
public class IndexButton extends GuiButton{
@ -56,4 +60,10 @@ public class IndexButton extends GuiButton{
this.gui.getFontRenderer().drawString(this.displayString, this.xPosition+textOffsetX, this.yPosition+(this.height-8)/2, 0);
}
}
public void drawHover(int mouseX, int mouseY){
if(this.chap instanceof BookletChapter && ((BookletChapter)this.chap).isIncomplete){
this.gui.drawHoveringText(this.gui.getFontRenderer().listFormattedStringToWidth(EnumChatFormatting.RED+StringUtil.localize("booklet."+ModUtil.MOD_ID_LOWER+".unavailable"), 250), mouseX, mouseY);
}
}
}

7
src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapter.java
View file

@ -27,6 +27,8 @@ public class BookletChapter implements IBookletChapter{
private final String unlocalizedName;
public EnumChatFormatting color;
public boolean isIncomplete;
public BookletChapter(String unlocalizedName, IBookletEntry entry, ItemStack displayStack, BookletPage... pages){
this.pages = pages.clone();
@ -48,6 +50,11 @@ public class BookletChapter implements IBookletChapter{
return this.pages;
}
public BookletChapter setIncomplete(){
this.isIncomplete = true;
return this;
}
@Override
public String getUnlocalizedName(){
return this.unlocalizedName;

5
src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/BookletEntry.java
View file

@ -13,7 +13,6 @@ package de.ellpeck.actuallyadditions.mod.booklet.entry;
import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
import de.ellpeck.actuallyadditions.api.booklet.IBookletChapter;
import de.ellpeck.actuallyadditions.api.booklet.IBookletEntry;
import de.ellpeck.actuallyadditions.mod.booklet.chapter.BookletChapter;
import de.ellpeck.actuallyadditions.mod.util.ModUtil;
import de.ellpeck.actuallyadditions.mod.util.StringUtil;
import net.minecraft.util.EnumChatFormatting;
@ -44,10 +43,6 @@ public class BookletEntry implements IBookletEntry{
return this.chapters;
}
public void addChapter(BookletChapter chapter){
this.chapters.add(chapter);
}
@Override
public String getLocalizedNameWithFormatting(){
return this.color+this.getLocalizedName();

4
src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/BookletEntryAllSearch.java
View file

@ -11,7 +11,6 @@
package de.ellpeck.actuallyadditions.mod.booklet.entry;
import de.ellpeck.actuallyadditions.api.booklet.IBookletChapter;
import de.ellpeck.actuallyadditions.mod.booklet.chapter.BookletChapter;
import java.util.ArrayList;
import java.util.List;
@ -26,7 +25,7 @@ public class BookletEntryAllSearch extends BookletEntry{
@SuppressWarnings("unchecked")
@Override
public void addChapter(BookletChapter chapter){
public void addChapter(IBookletChapter chapter){
this.allChapters.add(chapter);
this.chapters = (ArrayList<IBookletChapter>)this.allChapters.clone();
}
@ -34,5 +33,6 @@ public class BookletEntryAllSearch extends BookletEntry{
@Override
public void setChapters(List<IBookletChapter> chapters){
this.allChapters = (ArrayList<IBookletChapter>)chapters;
this.chapters = (ArrayList<IBookletChapter>)this.allChapters.clone();
}
}

1
src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java
View file

@ -118,6 +118,7 @@ public class CreativeTab extends CreativeTabs{
add(InitBlocks.blockPillarQuartzSlab);
add(InitBlocks.blockColoredLamp);
add(InitBlocks.blockColoredLampOn);
add(InitBlocks.blockLampPowerer);
add(InitBlocks.blockTreasureChest);

17
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java
View file

@ -13,6 +13,7 @@ package de.ellpeck.actuallyadditions.mod.items;
import cofh.api.energy.IEnergyContainerItem;
import com.google.common.collect.Multimap;
import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheColoredLampColors;
import de.ellpeck.actuallyadditions.mod.config.ConfigValues;
import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler;
import de.ellpeck.actuallyadditions.mod.items.base.ItemEnergy;
@ -37,10 +38,7 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.util.BlockPos;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.*;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.fml.relauncher.Side;
@ -109,6 +107,17 @@ public class ItemDrill extends ItemEnergy{
return false;
}
@Override
protected void registerRendering(){
ResourceLocation[] resLocs = new ResourceLocation[16];
for(int i = 0; i < 16; i++){
String name = this.getBaseName()+TheColoredLampColors.values()[i].name;
resLocs[i] = new ResourceLocation(ModUtil.MOD_ID_LOWER, name);
ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this, 1, i), new ResourceLocation(ModUtil.MOD_ID_LOWER, name));
}
ActuallyAdditions.proxy.addRenderVariant(this, resLocs);
}
/**
* Checks if a certain Upgrade is installed and returns it as an ItemStack
*

3
src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemAllToolAA.java
View file

@ -81,7 +81,8 @@ public class ItemAllToolAA extends ItemTool{
}
protected void registerRendering(){
ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this), new ResourceLocation(ModUtil.MOD_ID_LOWER, this.getBaseName()));
ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this), new ResourceLocation(ModUtil.MOD_ID_LOWER, "itemPaxel"));
ActuallyAdditions.proxy.addRenderVariant(this, new ResourceLocation(ModUtil.MOD_ID_LOWER, "itemPaxel"));
}
protected String getBaseName(){

2
src/main/java/de/ellpeck/actuallyadditions/mod/misc/cloud/SmileyCloudEasterEggs.java
View file

@ -385,7 +385,7 @@ public class SmileyCloudEasterEggs{
GlStateManager.translate(-0.5F, 0.2F, leftHand ? 0.55F : -0.5F);
GlStateManager.scale(0.75F, 0.75F, 0.75F);
AssetUtil.renderItemInWorld(stack, 0);
AssetUtil.renderItemInWorld(stack);
GlStateManager.popMatrix();
}

33
src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/RenderSpecial.java
View file

@ -20,6 +20,7 @@ import net.minecraft.entity.player.EnumPlayerModelParts;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Vec3;
import java.util.Calendar;
@ -32,21 +33,19 @@ public class RenderSpecial{
this.theThingToRender = stack;
}
public void render(EntityPlayer player){
if(player.isInvisible() || player.isWearing(EnumPlayerModelParts.CAPE)){
public void render(EntityPlayer player, float partialTicks){
if(player.isInvisible() || !player.isWearing(EnumPlayerModelParts.CAPE)){
return;
}
boolean isBlock = this.theThingToRender.getItem() instanceof ItemBlock;
float size = isBlock ? 0.3F : 0.4F;
double offsetUp = isBlock ? 0F : 0.2F;
if(ClientProxy.pumpkinBlurPumpkinBlur){
this.theThingToRender = new ItemStack(Calendar.getInstance().get(Calendar.DAY_OF_MONTH)%2 == 0 ? Blocks.lit_pumpkin : Blocks.pumpkin);
size = 0.3F;
offsetUp = 0;
}
boolean isBlock = this.theThingToRender.getItem() instanceof ItemBlock;
float size = isBlock ? 0.5F : 0.4F;
double offsetUp = isBlock ? 0D : 0.1875D;
double bobHeight = 70;
double theTime = Minecraft.getSystemTime();
double time = theTime/50;
@ -56,15 +55,20 @@ public class RenderSpecial{
}
GlStateManager.pushMatrix();
GlStateManager.translate(0D, -0.775D+offsetUp, 0D);
Vec3 currentPos = Minecraft.getMinecraft().thePlayer.getPositionEyes(partialTicks);
Vec3 playerPos = player.getPositionEyes(partialTicks);
GlStateManager.translate(playerPos.xCoord-currentPos.xCoord, playerPos.yCoord-currentPos.yCoord-(player.isSneaking() || Minecraft.getMinecraft().thePlayer.isSneaking() ? 0.125D : 0D), playerPos.zCoord-currentPos.zCoord);
GlStateManager.translate(0D, 2.535D+offsetUp, 0D);
GlStateManager.rotate(180F, 1.0F, 0.0F, 1.0F);
GlStateManager.scale(size, size, size);
if(time-(bobHeight/2) >= lastTimeForBobbing){
GlStateManager.translate(0, (time-this.lastTimeForBobbing)/100, 0);
GlStateManager.translate(0D, (time-this.lastTimeForBobbing)/100D, 0D);
}
else{
GlStateManager.translate(0, -(time-lastTimeForBobbing)/100+bobHeight/100, 0);
GlStateManager.translate(0D, -(time-lastTimeForBobbing)/100D+bobHeight/100D, 0D);
}
GlStateManager.rotate((float)(theTime/20), 0, 1, 0);
@ -75,8 +79,11 @@ public class RenderSpecial{
AssetUtil.renderBlockInWorld(Block.getBlockFromItem(this.theThingToRender.getItem()), this.theThingToRender.getItemDamage());
}
else{
GlStateManager.translate(-0.5F, 0F, 0F);
AssetUtil.renderItemInWorld(this.theThingToRender, 0);
GlStateManager.pushMatrix();
GlStateManager.translate(0D, 0.5D, 0D);
GlStateManager.rotate(180F, 1F, 0F, 0F);
AssetUtil.renderItemInWorld(this.theThingToRender);
GlStateManager.popMatrix();
}
}
GlStateManager.enableLighting();

3
src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/SpecialRenderInit.java
View file

@ -68,14 +68,13 @@ public class SpecialRenderInit{
}
@SubscribeEvent(priority = EventPriority.HIGHEST)
//TODO Fix floating item
public void onPlayerRender(RenderPlayerEvent.Pre event){
if(!specialList.isEmpty()){
for(Map.Entry<String, RenderSpecial> entry : specialList.entrySet()){
//Does the player have one of the names from the list?
if(StringUtil.equalsToLowerCase(entry.getKey(), event.entityPlayer.getName())){
//Render the special Item/Block
entry.getValue().render(event.entityPlayer);
entry.getValue().render(event.entityPlayer, event.partialRenderTick);
break;
}
}

36
src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java
View file

@ -11,16 +11,9 @@
package de.ellpeck.actuallyadditions.mod.proxy;
import de.ellpeck.actuallyadditions.mod.blocks.render.RenderLaserRelay;
import de.ellpeck.actuallyadditions.mod.blocks.render.RenderReconstructorLens;
import de.ellpeck.actuallyadditions.mod.blocks.render.RenderSmileyCloud;
import de.ellpeck.actuallyadditions.mod.blocks.render.RenderTileEntity;
import de.ellpeck.actuallyadditions.mod.blocks.render.model.*;
import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues;
import de.ellpeck.actuallyadditions.mod.event.InitEvents;
import de.ellpeck.actuallyadditions.mod.misc.special.SpecialRenderInit;
import de.ellpeck.actuallyadditions.mod.tile.*;
import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
import de.ellpeck.actuallyadditions.mod.util.ModUtil;
import de.ellpeck.actuallyadditions.mod.util.playerdata.PersistentClientData;
import net.minecraft.client.Minecraft;
@ -28,9 +21,7 @@ import net.minecraft.client.resources.model.ModelBakery;
import net.minecraft.client.resources.model.ModelResourceLocation;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.client.registry.ClientRegistry;
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
@ -77,15 +68,16 @@ public class ClientProxy implements IProxy{
InitEvents.initClient();
registerRenderer(TileEntityCompost.class, new RenderTileEntity(new ModelCompost()), AssetUtil.compostRenderId);
registerRenderer(TileEntityFishingNet.class, new RenderTileEntity(new ModelFishingNet()), AssetUtil.fishingNetRenderId);
registerRenderer(TileEntityFurnaceSolar.class, new RenderTileEntity(new ModelFurnaceSolar()), AssetUtil.furnaceSolarRenderId);
registerRenderer(TileEntityCoffeeMachine.class, new RenderTileEntity(new ModelCoffeeMachine()), AssetUtil.coffeeMachineRenderId);
registerRenderer(TileEntityPhantomBooster.class, new RenderTileEntity(new ModelPhantomBooster()), AssetUtil.phantomBoosterRenderId);
registerRenderer(TileEntitySmileyCloud.class, new RenderSmileyCloud(new ModelSmileyCloud()), AssetUtil.smileyCloudRenderId);
registerRenderer(TileEntityLaserRelay.class, new RenderLaserRelay(new ModelLaserRelay()), AssetUtil.laserRelayRenderId);
registerRenderer(TileEntityBookletStand.class, new RenderTileEntity(new ModelBookletStand()), AssetUtil.bookletStandRenderId);
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityAtomicReconstructor.class, new RenderReconstructorLens());
//TODO Fix Tile rendering
/*ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCompost.class, new RenderTileEntity(new ModelCompost()));
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityFishingNet.class, new RenderTileEntity(new ModelFishingNet()));
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityFurnaceSolar.class, new RenderTileEntity(new ModelFurnaceSolar()));
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCoffeeMachine.class, new RenderTileEntity(new ModelCoffeeMachine()));
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityPhantomBooster.class, new RenderTileEntity(new ModelPhantomBooster()));
ClientRegistry.bindTileEntitySpecialRenderer(TileEntitySmileyCloud.class, new RenderSmileyCloud(new ModelSmileyCloud()));
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityLaserRelay.class, new RenderLaserRelay(new ModelLaserRelay()));
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityBookletStand.class, new RenderTileEntity(new ModelBookletStand()));
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityAtomicReconstructor.class, new RenderReconstructorLens());*/
//TODO Fix villager
//VillagerRegistry.instance().registerVillagerSkin(ConfigIntValues.JAM_VILLAGER_ID.getValue(), new ResourceLocation(ModUtil.MOD_ID_LOWER, "textures/entity/villager/jamVillager.png"));
@ -108,13 +100,7 @@ public class ClientProxy implements IProxy{
}
@Override
public void addRenderVariant(Item item, ResourceLocation[] location){
public void addRenderVariant(Item item, ResourceLocation... location){
modelVariantsForRegistering.put(item, location);
}
private static void registerRenderer(Class<? extends TileEntity> tileClass, RenderTileEntity tileRender, int renderID){
ClientRegistry.bindTileEntitySpecialRenderer(tileClass, tileRender);
//TODO Fix inventory rendering
//RenderingRegistry.registerBlockHandler(new RenderInventory(tileRender, renderID));
}
}

2
src/main/java/de/ellpeck/actuallyadditions/mod/proxy/IProxy.java
View file

@ -27,5 +27,5 @@ public interface IProxy{
void addRenderRegister(ItemStack stack, ResourceLocation location);
void addRenderVariant(Item item, ResourceLocation[] location);
void addRenderVariant(Item item, ResourceLocation... location);
}

2
src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ServerProxy.java
View file

@ -42,7 +42,7 @@ public class ServerProxy implements IProxy{
}
@Override
public void addRenderVariant(Item item, ResourceLocation[] location){
public void addRenderVariant(Item item, ResourceLocation... location){
}
}

2
src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDirectionalBreaker.java
View file

@ -76,7 +76,7 @@ public class TileEntityDirectionalBreaker extends TileEntityInventoryBase implem
drops.addAll(blockToBreak.getDrops(worldObj, coordsBlock, worldObj.getBlockState(coordsBlock), 0));
if(WorldUtil.addToInventory(this, drops, false, true)){
worldObj.playAuxSFX(2001, this.getPos(), Block.getIdFromBlock(blockToBreak)+(meta << 12));
worldObj.playAuxSFX(2001, coordsBlock, Block.getIdFromBlock(blockToBreak)+(meta << 12));
WorldUtil.breakBlockAtSide(sideToManipulate, worldObj, this.getPos(), i);
WorldUtil.addToInventory(this, drops, true, true);
this.storage.extractEnergy(ENERGY_USE, false);

1
src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityXPSolidifier.java
View file

@ -95,6 +95,7 @@ public class TileEntityXPSolidifier extends TileEntityInventoryBase implements I
}
}
//TODO Fix XP System to fit points needed in 1.8 (OpenBlocks?)
/**
* Gets the Player's XP
* (Excerpted from OpenBlocks' XP system with permission, thanks guys!)

33
src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java
View file

@ -18,6 +18,7 @@ import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.WorldRenderer;
import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
@ -30,15 +31,6 @@ public class AssetUtil{
public static final ResourceLocation GUI_INVENTORY_LOCATION = getGuiLocation("guiInventory");
public static final int TESR_RENDER_ID = 2;
public static int compostRenderId;
public static int fishingNetRenderId;
public static int furnaceSolarRenderId;
public static int coffeeMachineRenderId;
public static int phantomBoosterRenderId;
public static int smileyCloudRenderId;
public static int laserRelayRenderId;
public static int bookletStandRenderId;
public static ResourceLocation getGuiLocation(String file){
return new ResourceLocation(ModUtil.MOD_ID_LOWER, "textures/gui/"+file+".png");
}
@ -53,22 +45,21 @@ public class AssetUtil{
}
@SideOnly(Side.CLIENT)
public static void renderItemInWorld(ItemStack stack, int renderPass){
//TODO Fix rendering items in world
/*IIcon icon = stack.getItem().getIcon(stack, renderPass);
float f = icon.getMinU();
float f1 = icon.getMaxU();
float f2 = icon.getMinV();
float f3 = icon.getMaxV();
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture);
ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F/16F);*/
public static void renderItemInWorld(ItemStack stack){
GlStateManager.pushMatrix();
GlStateManager.disableLighting();
GlStateManager.pushAttrib();
RenderHelper.enableStandardItemLighting();
Minecraft.getMinecraft().getRenderItem().renderItem(stack, TransformType.FIXED);
RenderHelper.disableStandardItemLighting();
GlStateManager.popAttrib();
GlStateManager.enableLighting();
GlStateManager.popMatrix();
}
@SideOnly(Side.CLIENT)
public static void renderBlockInWorld(Block block, int meta){
//TODO Fix rendering blocks in world
/*Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
RenderBlocks.getInstance().renderBlockAsItem(block, meta, 1F);*/
renderItemInWorld(new ItemStack(block, 1, meta));
}
@SideOnly(Side.CLIENT)

3
src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java
View file

@ -46,7 +46,7 @@ public class WorldUtil{
public static void breakBlockAtSide(EnumFacing side, World world, BlockPos pos, int offset){
BlockPos c = getCoordsFromSide(side, pos, offset);
if(c != null){
world.setBlockToAir(pos);
world.setBlockToAir(c);
}
}
@ -398,7 +398,6 @@ public class WorldUtil{
}
else{
//Check the Server if a Block that changed on the Client really changed, if not, revert the change
//TODO Check if this is the right action
Minecraft.getMinecraft().getNetHandler().addToSendQueue(new C07PacketPlayerDigging(C07PacketPlayerDigging.Action.STOP_DESTROY_BLOCK, pos, Minecraft.getMinecraft().objectMouseOver.sideHit));
}
return removed;

5
src/main/resources/assets/actuallyadditions/blockstates/blockBlackLotus.json Normal file
View file

@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "actuallyadditions:blockBlackLotus" }
}
}

10
src/main/resources/assets/actuallyadditions/blockstates/blockBreaker.json Normal file
View file

@ -0,0 +1,10 @@
{
"variants": {
"meta=0": { "model": "actuallyadditions:blockBreaker", "x": 90 },
"meta=1": { "model": "actuallyadditions:blockBreaker", "x": -90 },
"meta=2": { "model": "actuallyadditions:blockBreaker", "y": 0 },
"meta=3": { "model": "actuallyadditions:blockBreaker", "y": 180 },
"meta=4": { "model": "actuallyadditions:blockBreaker", "y": 270 },
"meta=5": { "model": "actuallyadditions:blockBreaker", "y": 90 }
}
}

5
src/main/resources/assets/actuallyadditions/blockstates/blockCanolaPress.json Normal file
View file

@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "actuallyadditions:blockCanolaPress" }
}
}

6
src/main/resources/assets/actuallyadditions/blockstates/blockCoalGenerator.json Normal file
View file

@ -0,0 +1,6 @@
{
"variants": {
"meta=0": { "model": "actuallyadditions:blockCoalGenerator" },
"meta=1": { "model": "actuallyadditions:blockCoalGenerator" }
}
}

10
src/main/resources/assets/actuallyadditions/blockstates/blockDirectionalBreaker.json Normal file
View file

@ -0,0 +1,10 @@
{
"variants": {
"meta=0": { "model": "actuallyadditions:blockDirectionalBreaker", "x": 90 },
"meta=1": { "model": "actuallyadditions:blockDirectionalBreaker", "x": -90 },
"meta=2": { "model": "actuallyadditions:blockDirectionalBreaker", "y": 0 },
"meta=3": { "model": "actuallyadditions:blockDirectionalBreaker", "y": 180 },
"meta=4": { "model": "actuallyadditions:blockDirectionalBreaker", "y": 270 },
"meta=5": { "model": "actuallyadditions:blockDirectionalBreaker", "y": 90 }
}
}

10
src/main/resources/assets/actuallyadditions/blockstates/blockDropper.json Normal file
View file

@ -0,0 +1,10 @@
{
"variants": {
"meta=0": { "model": "actuallyadditions:blockDropper", "x": 90 },
"meta=1": { "model": "actuallyadditions:blockDropper", "x": -90 },
"meta=2": { "model": "actuallyadditions:blockDropper", "y": 0 },
"meta=3": { "model": "actuallyadditions:blockDropper", "y": 180 },
"meta=4": { "model": "actuallyadditions:blockDropper", "y": 270 },
"meta=5": { "model": "actuallyadditions:blockDropper", "y": 90 }
}
}

5
src/main/resources/assets/actuallyadditions/blockstates/blockEnergizer.json Normal file
View file

@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "actuallyadditions:blockEnergizer" }
}
}

5
src/main/resources/assets/actuallyadditions/blockstates/blockEnervator.json Normal file
View file

@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "actuallyadditions:blockEnervator" }
}
}

5
src/main/resources/assets/actuallyadditions/blockstates/blockFeeder.json Normal file
View file

@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "actuallyadditions:blockFeeder" }
}
}

5
src/main/resources/assets/actuallyadditions/blockstates/blockFermentingBarrel.json Normal file
View file

@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "actuallyadditions:blockFermentingBarrel" }
}
}

10
src/main/resources/assets/actuallyadditions/blockstates/blockFluidCollector.json Normal file
View file

@ -0,0 +1,10 @@
{
"variants": {
"meta=0": { "model": "actuallyadditions:blockFluidCollector", "x": 90 },
"meta=1": { "model": "actuallyadditions:blockFluidCollector", "x": -90 },
"meta=2": { "model": "actuallyadditions:blockFluidCollector", "y": 0 },
"meta=3": { "model": "actuallyadditions:blockFluidCollector", "y": 180 },
"meta=4": { "model": "actuallyadditions:blockFluidCollector", "y": 270 },
"meta=5": { "model": "actuallyadditions:blockFluidCollector", "y": 90 }
}
}

10
src/main/resources/assets/actuallyadditions/blockstates/blockFluidPlacer.json Normal file
View file

@ -0,0 +1,10 @@
{
"variants": {
"meta=0": { "model": "actuallyadditions:blockFluidPlacer", "x": 90 },
"meta=1": { "model": "actuallyadditions:blockFluidPlacer", "x": -90 },
"meta=2": { "model": "actuallyadditions:blockFluidPlacer", "y": 0 },
"meta=3": { "model": "actuallyadditions:blockFluidPlacer", "y": 180 },
"meta=4": { "model": "actuallyadditions:blockFluidPlacer", "y": 270 },
"meta=5": { "model": "actuallyadditions:blockFluidPlacer", "y": 90 }
}
}

12
src/main/resources/assets/actuallyadditions/blockstates/blockFurnaceDouble.json Normal file
View file

@ -0,0 +1,12 @@
{
"variants": {
"meta=0": { "model": "actuallyadditions:blockFurnaceDouble", "y": 0 },
"meta=1": { "model": "actuallyadditions:blockFurnaceDouble", "y": 180 },
"meta=2": { "model": "actuallyadditions:blockFurnaceDouble", "y": -90 },
"meta=3": { "model": "actuallyadditions:blockFurnaceDouble", "y": 90 },
"meta=4": { "model": "actuallyadditions:blockFurnaceDoubleOn", "y": 0 },
"meta=5": { "model": "actuallyadditions:blockFurnaceDoubleOn", "y": 180 },
"meta=6": { "model": "actuallyadditions:blockFurnaceDoubleOn", "y": -90 },
"meta=7": { "model": "actuallyadditions:blockFurnaceDoubleOn", "y": 90 }
}
}

5
src/main/resources/assets/actuallyadditions/blockstates/blockGiantChest.json Normal file
View file

@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "actuallyadditions:blockGiantChest" }
}
}

5
src/main/resources/assets/actuallyadditions/blockstates/blockGreenhouseGlass.json Normal file
View file

@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "actuallyadditions:blockGreenhouseGlass" }
}
}

6
src/main/resources/assets/actuallyadditions/blockstates/blockGrinderDouble.json Normal file
View file

@ -0,0 +1,6 @@
{
"variants": {
"meta=0": { "model": "actuallyadditions:blockGrinderDouble" },
"meta=1": { "model": "actuallyadditions:blockGrinderDoubleOn" }
}
}

5
src/main/resources/assets/actuallyadditions/blockstates/blockHeatCollector.json Normal file
View file

@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "actuallyadditions:blockHeatCollector" }
}
}

5
src/main/resources/assets/actuallyadditions/blockstates/blockItemRepairer.json Normal file
View file

@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "actuallyadditions:blockItemRepairer" }
}
}

10
src/main/resources/assets/actuallyadditions/blockstates/blockLampPowerer.json Normal file
View file

@ -0,0 +1,10 @@
{
"variants": {
"meta=0": { "model": "actuallyadditions:blockLampPowerer", "x": 90 },
"meta=1": { "model": "actuallyadditions:blockLampPowerer", "x": -90 },
"meta=2": { "model": "actuallyadditions:blockLampPowerer", "y": 0 },
"meta=3": { "model": "actuallyadditions:blockLampPowerer", "y": 180 },
"meta=4": { "model": "actuallyadditions:blockLampPowerer", "y": 270 },
"meta=5": { "model": "actuallyadditions:blockLampPowerer", "y": 90 }
}
}

5
src/main/resources/assets/actuallyadditions/blockstates/blockLavaFactoryController.json Normal file
View file

@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "actuallyadditions:blockLavaFactoryController" }
}
}

5
src/main/resources/assets/actuallyadditions/blockstates/blockLeafGenerator.json Normal file
View file

@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "actuallyadditions:blockLeafGenerator" }
}
}

5
src/main/resources/assets/actuallyadditions/blockstates/blockMiner.json Normal file
View file

@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "actuallyadditions:blockMiner" }
}
}

14
src/main/resources/assets/actuallyadditions/blockstates/blockMisc.json Normal file
View file

@ -0,0 +1,14 @@
{
"variants": {
"meta=0": { "model": "actuallyadditions:blockMiscBlackQuartzPillar" },
"meta=1": { "model": "actuallyadditions:blockMiscBlackQuartzChiseled" },
"meta=2": { "model": "actuallyadditions:blockMiscBlackQuartz" },
"meta=3": { "model": "actuallyadditions:blockMiscOreBlackQuartz" },
"meta=4": { "model": "actuallyadditions:blockMiscWoodCasing" },
"meta=5": { "model": "actuallyadditions:blockMiscCharcoal" },
"meta=6": { "model": "actuallyadditions:blockMiscEnderpearl" },
"meta=7": { "model": "actuallyadditions:blockMiscLavaFactoryCase" },
"meta=8": { "model": "actuallyadditions:blockMiscEnderCasing" },
"meta=9": { "model": "actuallyadditions:blockMiscIronCasing" }
}
}

6
src/main/resources/assets/actuallyadditions/blockstates/blockOilGenerator.json Normal file
View file

@ -0,0 +1,6 @@
{
"variants": {
"meta=0": { "model": "actuallyadditions:blockOilGenerator" },
"meta=1": { "model": "actuallyadditions:blockOilGenerator" }
}
}

10
src/main/resources/assets/actuallyadditions/blockstates/blockPlacer.json Normal file
View file

@ -0,0 +1,10 @@
{
"variants": {
"meta=0": { "model": "actuallyadditions:blockPlacer", "x": 90 },
"meta=1": { "model": "actuallyadditions:blockPlacer", "x": -90 },
"meta=2": { "model": "actuallyadditions:blockPlacer", "y": 0 },
"meta=3": { "model": "actuallyadditions:blockPlacer", "y": 180 },
"meta=4": { "model": "actuallyadditions:blockPlacer", "y": 270 },
"meta=5": { "model": "actuallyadditions:blockPlacer", "y": 90 }
}
}

5
src/main/resources/assets/actuallyadditions/blockstates/blockRangedCollector.json Normal file
View file

@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "actuallyadditions:blockRangedCollector" }
}
}

36
src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksGreenFence.json Normal file
View file

@ -0,0 +1,36 @@
{
"variants": {
"east=false,north=false,south=false,up=false,west=false": { "model": "actuallyadditions:blockTestifiBucksGreenFencePost" },
"east=false,north=true,south=false,up=false,west=false": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorth" },
"east=true,north=false,south=false,up=false,west=false": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorth", "y": 90, "uvlock": true },
"east=false,north=false,south=true,up=false,west=false": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorth", "y": 180, "uvlock": true },
"east=false,north=false,south=false,up=false,west=true": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorth", "y": 270, "uvlock": true },
"east=true,north=true,south=false,up=false,west=false": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthEast" },
"east=true,north=false,south=true,up=false,west=false": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthEast", "y": 90, "uvlock": true },
"east=false,north=false,south=true,up=false,west=true": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthEast", "y": 180, "uvlock": true },
"east=false,north=true,south=false,up=false,west=true": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthEast", "y": 270, "uvlock": true },
"east=false,north=true,south=true,up=false,west=false": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthSouth" },
"east=true,north=false,south=false,up=false,west=true": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthSouth", "y": 90, "uvlock": true },
"east=true,north=true,south=true,up=false,west=false": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthSouthEast" },
"east=true,north=false,south=true,up=false,west=true": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthSouthEast", "y": 90, "uvlock": true },
"east=false,north=true,south=true,up=false,west=true": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthSouthEast", "y": 180, "uvlock": true },
"east=true,north=true,south=false,up=false,west=true": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthSouthEast", "y": 270, "uvlock": true },
"east=true,north=true,south=true,up=false,west=true": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthSouthEastWest" },
"east=false,north=false,south=false,up=true,west=false": { "model": "actuallyadditions:blockTestifiBucksGreenFencePost" },
"east=false,north=true,south=false,up=true,west=false": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorth" },
"east=true,north=false,south=false,up=true,west=false": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorth", "y": 90, "uvlock": true },
"east=false,north=false,south=true,up=true,west=false": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorth", "y": 180, "uvlock": true },
"east=false,north=false,south=false,up=true,west=true": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorth", "y": 270, "uvlock": true },
"east=true,north=true,south=false,up=true,west=false": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthEast" },
"east=true,north=false,south=true,up=true,west=false": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthEast", "y": 90, "uvlock": true },
"east=false,north=false,south=true,up=true,west=true": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthEast", "y": 180, "uvlock": true },
"east=false,north=true,south=false,up=true,west=true": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthEast", "y": 270, "uvlock": true },
"east=false,north=true,south=true,up=true,west=false": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthSouthAbove" },
"east=true,north=false,south=false,up=true,west=true": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthSouthAbove", "y": 90, "uvlock": true },
"east=true,north=true,south=true,up=true,west=false": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthSouthEast" },
"east=true,north=false,south=true,up=true,west=true": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthSouthEast", "y": 90, "uvlock": true },
"east=false,north=true,south=true,up=true,west=true": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthSouthEast", "y": 180, "uvlock": true },
"east=true,north=true,south=false,up=true,west=true": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthSouthEast", "y": 270, "uvlock": true },
"east=true,north=true,south=true,up=true,west=true": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthSouthEastWest" }
}
}

6
src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksGreenSlab.json Normal file
View file

@ -0,0 +1,6 @@
{
"variants": {
"meta=0": { "model": "actuallyadditions:blockTestifiBucksGreenSlabBottom" },
"meta=1": { "model": "actuallyadditions:blockTestifiBucksGreenSlabTop" }
}
}

44
src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksGreenStairs.json Normal file
View file

@ -0,0 +1,44 @@
{
"variants": {
"facing=east,half=bottom,shape=straight": { "model": "actuallyadditions:blockTestifiBucksGreenStairs" },
"facing=west,half=bottom,shape=straight": { "model": "actuallyadditions:blockTestifiBucksGreenStairs", "y": 180, "uvlock": true },
"facing=south,half=bottom,shape=straight": { "model": "actuallyadditions:blockTestifiBucksGreenStairs", "y": 90, "uvlock": true },
"facing=north,half=bottom,shape=straight": { "model": "actuallyadditions:blockTestifiBucksGreenStairs", "y": 270, "uvlock": true },
"facing=east,half=bottom,shape=outer_right": { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter" },
"facing=west,half=bottom,shape=outer_right": { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter", "y": 180, "uvlock": true },
"facing=south,half=bottom,shape=outer_right": { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter", "y": 90, "uvlock": true },
"facing=north,half=bottom,shape=outer_right": { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter", "y": 270, "uvlock": true },
"facing=east,half=bottom,shape=outer_left": { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter", "y": 270, "uvlock": true },
"facing=west,half=bottom,shape=outer_left": { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter", "y": 90, "uvlock": true },
"facing=south,half=bottom,shape=outer_left": { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter" },
"facing=north,half=bottom,shape=outer_left": { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter", "y": 180, "uvlock": true },
"facing=east,half=bottom,shape=inner_right": { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner" },
"facing=west,half=bottom,shape=inner_right": { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner", "y": 180, "uvlock": true },
"facing=south,half=bottom,shape=inner_right": { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner", "y": 90, "uvlock": true },
"facing=north,half=bottom,shape=inner_right": { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner", "y": 270, "uvlock": true },
"facing=east,half=bottom,shape=inner_left": { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner", "y": 270, "uvlock": true },
"facing=west,half=bottom,shape=inner_left": { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner", "y": 90, "uvlock": true },
"facing=south,half=bottom,shape=inner_left": { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner" },
"facing=north,half=bottom,shape=inner_left": { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner", "y": 180, "uvlock": true },
"facing=east,half=top,shape=straight": { "model": "actuallyadditions:blockTestifiBucksGreenStairs", "x": 180, "uvlock": true },
"facing=west,half=top,shape=straight": { "model": "actuallyadditions:blockTestifiBucksGreenStairs", "x": 180, "y": 180, "uvlock": true },
"facing=south,half=top,shape=straight": { "model": "actuallyadditions:blockTestifiBucksGreenStairs", "x": 180, "y": 90, "uvlock": true },
"facing=north,half=top,shape=straight": { "model": "actuallyadditions:blockTestifiBucksGreenStairs", "x": 180, "y": 270, "uvlock": true },
"facing=east,half=top,shape=outer_right": { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter", "x": 180, "uvlock": true },
"facing=west,half=top,shape=outer_right": { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter", "x": 180, "y": 180, "uvlock": true },
"facing=south,half=top,shape=outer_right": { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter", "x": 180, "y": 90, "uvlock": true },
"facing=north,half=top,shape=outer_right": { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter", "x": 180, "y": 270, "uvlock": true },
"facing=east,half=top,shape=outer_left": { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter", "x": 180, "y": 90, "uvlock": true },
"facing=west,half=top,shape=outer_left": { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter", "x": 180, "y": 270, "uvlock": true },
"facing=south,half=top,shape=outer_left": { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter", "x": 180, "y": 180, "uvlock": true },
"facing=north,half=top,shape=outer_left": { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter", "x": 180, "uvlock": true },
"facing=east,half=top,shape=inner_right": { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner", "x": 180, "uvlock": true },
"facing=west,half=top,shape=inner_right": { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner", "x": 180, "y": 180, "uvlock": true },
"facing=south,half=top,shape=inner_right": { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner", "x": 180, "y": 90, "uvlock": true },
"facing=north,half=top,shape=inner_right": { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner", "x": 180, "y": 270, "uvlock": true },
"facing=east,half=top,shape=inner_left": { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner", "x": 180, "y": 90, "uvlock": true },
"facing=west,half=top,shape=inner_left": { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner", "x": 180, "y": 270, "uvlock": true },
"facing=south,half=top,shape=inner_left": { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner", "x": 180, "y": 180, "uvlock": true },
"facing=north,half=top,shape=inner_left": { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner", "x": 180, "uvlock": true }
}
}

5
src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksGreenWall.json Normal file
View file

@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "actuallyadditions:blockTestifiBucksGreenWall" }
}
}

36
src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksWhiteFence.json Normal file
View file

@ -0,0 +1,36 @@
{
"variants": {
"east=false,north=false,south=false,up=false,west=false": { "model": "actuallyadditions:blockTestifiBucksWhiteFencePost" },
"east=false,north=true,south=false,up=false,west=false": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorth" },
"east=true,north=false,south=false,up=false,west=false": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorth", "y": 90, "uvlock": true },
"east=false,north=false,south=true,up=false,west=false": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorth", "y": 180, "uvlock": true },
"east=false,north=false,south=false,up=false,west=true": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorth", "y": 270, "uvlock": true },
"east=true,north=true,south=false,up=false,west=false": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthEast" },
"east=true,north=false,south=true,up=false,west=false": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthEast", "y": 90, "uvlock": true },
"east=false,north=false,south=true,up=false,west=true": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthEast", "y": 180, "uvlock": true },
"east=false,north=true,south=false,up=false,west=true": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthEast", "y": 270, "uvlock": true },
"east=false,north=true,south=true,up=false,west=false": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthSouth" },
"east=true,north=false,south=false,up=false,west=true": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthSouth", "y": 90, "uvlock": true },
"east=true,north=true,south=true,up=false,west=false": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthSouthEast" },
"east=true,north=false,south=true,up=false,west=true": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthSouthEast", "y": 90, "uvlock": true },
"east=false,north=true,south=true,up=false,west=true": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthSouthEast", "y": 180, "uvlock": true },
"east=true,north=true,south=false,up=false,west=true": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthSouthEast", "y": 270, "uvlock": true },
"east=true,north=true,south=true,up=false,west=true": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthSouthEastWest" },
"east=false,north=false,south=false,up=true,west=false": { "model": "actuallyadditions:blockTestifiBucksWhiteFencePost" },
"east=false,north=true,south=false,up=true,west=false": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorth" },
"east=true,north=false,south=false,up=true,west=false": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorth", "y": 90, "uvlock": true },
"east=false,north=false,south=true,up=true,west=false": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorth", "y": 180, "uvlock": true },
"east=false,north=false,south=false,up=true,west=true": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorth", "y": 270, "uvlock": true },
"east=true,north=true,south=false,up=true,west=false": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthEast" },
"east=true,north=false,south=true,up=true,west=false": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthEast", "y": 90, "uvlock": true },
"east=false,north=false,south=true,up=true,west=true": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthEast", "y": 180, "uvlock": true },
"east=false,north=true,south=false,up=true,west=true": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthEast", "y": 270, "uvlock": true },
"east=false,north=true,south=true,up=true,west=false": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthSouthAbove" },
"east=true,north=false,south=false,up=true,west=true": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthSouthAbove", "y": 90, "uvlock": true },
"east=true,north=true,south=true,up=true,west=false": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthSouthEast" },
"east=true,north=false,south=true,up=true,west=true": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthSouthEast", "y": 90, "uvlock": true },
"east=false,north=true,south=true,up=true,west=true": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthSouthEast", "y": 180, "uvlock": true },
"east=true,north=true,south=false,up=true,west=true": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthSouthEast", "y": 270, "uvlock": true },
"east=true,north=true,south=true,up=true,west=true": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthSouthEastWest" }
}
}

6
src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksWhiteSlab.json Normal file
View file

@ -0,0 +1,6 @@
{
"variants": {
"meta=0": { "model": "actuallyadditions:blockTestifiBucksWhiteSlabBottom" },
"meta=1": { "model": "actuallyadditions:blockTestifiBucksWhiteSlabTop" }
}
}

44
src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksWhiteStairs.json Normal file
View file

@ -0,0 +1,44 @@
{
"variants": {
"facing=east,half=bottom,shape=straight": { "model": "actuallyadditions:blockTestifiBucksWhiteStairs" },
"facing=west,half=bottom,shape=straight": { "model": "actuallyadditions:blockTestifiBucksWhiteStairs", "y": 180, "uvlock": true },
"facing=south,half=bottom,shape=straight": { "model": "actuallyadditions:blockTestifiBucksWhiteStairs", "y": 90, "uvlock": true },
"facing=north,half=bottom,shape=straight": { "model": "actuallyadditions:blockTestifiBucksWhiteStairs", "y": 270, "uvlock": true },
"facing=east,half=bottom,shape=outer_right": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter" },
"facing=west,half=bottom,shape=outer_right": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter", "y": 180, "uvlock": true },
"facing=south,half=bottom,shape=outer_right": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter", "y": 90, "uvlock": true },
"facing=north,half=bottom,shape=outer_right": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter", "y": 270, "uvlock": true },
"facing=east,half=bottom,shape=outer_left": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter", "y": 270, "uvlock": true },
"facing=west,half=bottom,shape=outer_left": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter", "y": 90, "uvlock": true },
"facing=south,half=bottom,shape=outer_left": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter" },
"facing=north,half=bottom,shape=outer_left": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter", "y": 180, "uvlock": true },
"facing=east,half=bottom,shape=inner_right": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner" },
"facing=west,half=bottom,shape=inner_right": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner", "y": 180, "uvlock": true },
"facing=south,half=bottom,shape=inner_right": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner", "y": 90, "uvlock": true },
"facing=north,half=bottom,shape=inner_right": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner", "y": 270, "uvlock": true },
"facing=east,half=bottom,shape=inner_left": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner", "y": 270, "uvlock": true },
"facing=west,half=bottom,shape=inner_left": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner", "y": 90, "uvlock": true },
"facing=south,half=bottom,shape=inner_left": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner" },
"facing=north,half=bottom,shape=inner_left": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner", "y": 180, "uvlock": true },
"facing=east,half=top,shape=straight": { "model": "actuallyadditions:blockTestifiBucksWhiteStairs", "x": 180, "uvlock": true },
"facing=west,half=top,shape=straight": { "model": "actuallyadditions:blockTestifiBucksWhiteStairs", "x": 180, "y": 180, "uvlock": true },
"facing=south,half=top,shape=straight": { "model": "actuallyadditions:blockTestifiBucksWhiteStairs", "x": 180, "y": 90, "uvlock": true },
"facing=north,half=top,shape=straight": { "model": "actuallyadditions:blockTestifiBucksWhiteStairs", "x": 180, "y": 270, "uvlock": true },
"facing=east,half=top,shape=outer_right": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter", "x": 180, "uvlock": true },
"facing=west,half=top,shape=outer_right": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter", "x": 180, "y": 180, "uvlock": true },
"facing=south,half=top,shape=outer_right": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter", "x": 180, "y": 90, "uvlock": true },
"facing=north,half=top,shape=outer_right": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter", "x": 180, "y": 270, "uvlock": true },
"facing=east,half=top,shape=outer_left": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter", "x": 180, "y": 90, "uvlock": true },
"facing=west,half=top,shape=outer_left": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter", "x": 180, "y": 270, "uvlock": true },
"facing=south,half=top,shape=outer_left": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter", "x": 180, "y": 180, "uvlock": true },
"facing=north,half=top,shape=outer_left": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter", "x": 180, "uvlock": true },
"facing=east,half=top,shape=inner_right": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner", "x": 180, "uvlock": true },
"facing=west,half=top,shape=inner_right": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner", "x": 180, "y": 180, "uvlock": true },
"facing=south,half=top,shape=inner_right": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner", "x": 180, "y": 90, "uvlock": true },
"facing=north,half=top,shape=inner_right": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner", "x": 180, "y": 270, "uvlock": true },
"facing=east,half=top,shape=inner_left": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner", "x": 180, "y": 90, "uvlock": true },
"facing=west,half=top,shape=inner_left": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner", "x": 180, "y": 270, "uvlock": true },
"facing=south,half=top,shape=inner_left": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner", "x": 180, "y": 180, "uvlock": true },
"facing=north,half=top,shape=inner_left": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner", "x": 180, "uvlock": true }
}
}

5
src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksWhiteWall.json Normal file
View file

@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "actuallyadditions:blockTestifiBucksWhiteWall" }
}
}

8
src/main/resources/assets/actuallyadditions/blockstates/blockTreasureChest.json Normal file
View file

@ -0,0 +1,8 @@
{
"variants": {
"meta=0": { "model": "actuallyadditions:blockTreasureChest", "y": 0 },
"meta=1": { "model": "actuallyadditions:blockTreasureChest", "y": 180 },
"meta=2": { "model": "actuallyadditions:blockTreasureChest", "y": -90 },
"meta=3": { "model": "actuallyadditions:blockTreasureChest", "y": 90 }
}
}

8
src/main/resources/assets/actuallyadditions/blockstates/blockXPSolidifier.json Normal file
View file

@ -0,0 +1,8 @@
{
"variants": {
"meta=0": { "model": "actuallyadditions:blockXPSolidifier", "y": 0 },
"meta=1": { "model": "actuallyadditions:blockXPSolidifier", "y": 180 },
"meta=2": { "model": "actuallyadditions:blockXPSolidifier", "y": -90 },
"meta=3": { "model": "actuallyadditions:blockXPSolidifier", "y": 90 }
}
}

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

@ -534,6 +534,7 @@ booklet.actuallyadditions.indexEntry.itemsRF.name=Items that use RF
#Booklet Info
booklet.actuallyadditions.recipeDisabled=The crafting recipe for this item is disabled in the Config File! If you're on a server, ask the server author to enable it in the config. If you're on a client, press the 'Open Config'-Button on the top right and enable the recipe!
booklet.actuallyadditions.unavailable=Parts of this feature are currently disabled or incomplete due to the not fully complete 1.8.9 Port. You may experience something that's missing or doesn't fully work. Please use this item with caution!
booklet.actuallyadditions.clickToSeeRecipe=Click to see more Information
booklet.actuallyadditions.amountOfWords=%s words in total
booklet.actuallyadditions.amountOfChars=%s characters in total

6
src/main/resources/assets/actuallyadditions/models/block/blockBlackLotus.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "block/cross",
"textures": {
"cross": "actuallyadditions:blocks/blockBlackLotus"
}
}

12
src/main/resources/assets/actuallyadditions/models/block/blockBreaker.json Normal file
View file

@ -0,0 +1,12 @@
{
"parent": "block/cube",
"textures": {
"particle": "actuallyadditions:blocks/blockBreaker",
"down": "actuallyadditions:blocks/blockBreakerTop",
"up": "actuallyadditions:blocks/blockBreakerTop",
"north": "actuallyadditions:blocks/blockBreakerFront",
"east": "actuallyadditions:blocks/blockBreaker",
"south": "actuallyadditions:blocks/blockBreaker",
"west": "actuallyadditions:blocks/blockBreaker"
}
}

12
src/main/resources/assets/actuallyadditions/models/block/blockCanolaPress.json Normal file
View file

@ -0,0 +1,12 @@
{
"parent": "block/cube",
"textures": {
"particle": "actuallyadditions:blocks/blockCanolaPress",
"down": "actuallyadditions:blocks/blockCanolaPressTop",
"up": "actuallyadditions:blocks/blockCanolaPressTop",
"north": "actuallyadditions:blocks/blockCanolaPress",
"east": "actuallyadditions:blocks/blockCanolaPress",
"south": "actuallyadditions:blocks/blockCanolaPress",
"west": "actuallyadditions:blocks/blockCanolaPress"
}
}

12
src/main/resources/assets/actuallyadditions/models/block/blockCoalGenerator.json Normal file
View file

@ -0,0 +1,12 @@
{
"parent": "block/cube",
"textures": {
"particle": "actuallyadditions:blocks/blockCoalGenerator",
"down": "actuallyadditions:blocks/blockCoalGeneratorBottom",
"up": "actuallyadditions:blocks/blockCoalGeneratorTop",
"north": "actuallyadditions:blocks/blockCoalGenerator",
"east": "actuallyadditions:blocks/blockCoalGenerator",
"south": "actuallyadditions:blocks/blockCoalGenerator",
"west": "actuallyadditions:blocks/blockCoalGenerator"
}
}

12
src/main/resources/assets/actuallyadditions/models/block/blockDirectionalBreaker.json Normal file
View file

@ -0,0 +1,12 @@
{
"parent": "block/cube",
"textures": {
"particle": "actuallyadditions:blocks/blockDirectionalBreaker",
"down": "actuallyadditions:blocks/blockDirectionalBreakerTop",
"up": "actuallyadditions:blocks/blockDirectionalBreakerTop",
"north": "actuallyadditions:blocks/blockDirectionalBreakerFront",
"east": "actuallyadditions:blocks/blockDirectionalBreaker",
"south": "actuallyadditions:blocks/blockDirectionalBreaker",
"west": "actuallyadditions:blocks/blockDirectionalBreaker"
}
}

12
src/main/resources/assets/actuallyadditions/models/block/blockDropper.json Normal file
View file

@ -0,0 +1,12 @@
{
"parent": "block/cube",
"textures": {
"particle": "actuallyadditions:blocks/blockDropper",
"down": "actuallyadditions:blocks/blockDropperTop",
"up": "actuallyadditions:blocks/blockDropperTop",
"north": "actuallyadditions:blocks/blockDropperFront",
"east": "actuallyadditions:blocks/blockDropper",
"south": "actuallyadditions:blocks/blockDropper",
"west": "actuallyadditions:blocks/blockDropper"
}
}

12
src/main/resources/assets/actuallyadditions/models/block/blockEnergizer.json Normal file
View file

@ -0,0 +1,12 @@
{
"parent": "block/cube",
"textures": {
"particle": "actuallyadditions:blocks/blockEnergizer",
"down": "actuallyadditions:blocks/blockEnergizer",
"up": "actuallyadditions:blocks/blockEnergizerTop",
"north": "actuallyadditions:blocks/blockEnergizerSide",
"east": "actuallyadditions:blocks/blockEnergizerSide",
"south": "actuallyadditions:blocks/blockEnergizerSide",
"west": "actuallyadditions:blocks/blockEnergizerSide"
}
}

12
src/main/resources/assets/actuallyadditions/models/block/blockEnervator.json Normal file
View file

@ -0,0 +1,12 @@
{
"parent": "block/cube",
"textures": {
"particle": "actuallyadditions:blocks/blockEnervator",
"down": "actuallyadditions:blocks/blockEnervator",
"up": "actuallyadditions:blocks/blockEnervatorTop",
"north": "actuallyadditions:blocks/blockEnervatorSide",
"east": "actuallyadditions:blocks/blockEnervatorSide",
"south": "actuallyadditions:blocks/blockEnervatorSide",
"west": "actuallyadditions:blocks/blockEnervatorSide"
}
}

12
src/main/resources/assets/actuallyadditions/models/block/blockFeeder.json Normal file
View file

@ -0,0 +1,12 @@
{
"parent": "block/cube",
"textures": {
"particle": "actuallyadditions:blocks/blockFeeder",
"down": "actuallyadditions:blocks/blockFeederTop",
"up": "actuallyadditions:blocks/blockFeederTop",
"north": "actuallyadditions:blocks/blockFeeder",
"east": "actuallyadditions:blocks/blockFeeder",
"south": "actuallyadditions:blocks/blockFeeder",
"west": "actuallyadditions:blocks/blockFeeder"
}
}

12
src/main/resources/assets/actuallyadditions/models/block/blockFermentingBarrel.json Normal file
View file

@ -0,0 +1,12 @@
{
"parent": "block/cube",
"textures": {
"particle": "actuallyadditions:blocks/blockFermentingBarrel",
"down": "actuallyadditions:blocks/blockFermentingBarrelTop",
"up": "actuallyadditions:blocks/blockFermentingBarrelTop",
"north": "actuallyadditions:blocks/blockFermentingBarrel",
"east": "actuallyadditions:blocks/blockFermentingBarrel",
"south": "actuallyadditions:blocks/blockFermentingBarrel",
"west": "actuallyadditions:blocks/blockFermentingBarrel"
}
}

12
src/main/resources/assets/actuallyadditions/models/block/blockFluidCollector.json Normal file
View file

@ -0,0 +1,12 @@
{
"parent": "block/cube",
"textures": {
"particle": "actuallyadditions:blocks/blockFluidCollector",
"down": "actuallyadditions:blocks/blockFluidCollectorTop",
"up": "actuallyadditions:blocks/blockFluidCollectorTop",
"north": "actuallyadditions:blocks/blockFluidCollectorFront",
"east": "actuallyadditions:blocks/blockFluidCollector",
"south": "actuallyadditions:blocks/blockFluidCollector",
"west": "actuallyadditions:blocks/blockFluidCollector"
}
}

12
src/main/resources/assets/actuallyadditions/models/block/blockFluidPlacer.json Normal file
View file

@ -0,0 +1,12 @@
{
"parent": "block/cube",
"textures": {
"particle": "actuallyadditions:blocks/blockFluidPlacer",
"down": "actuallyadditions:blocks/blockFluidPlacerTop",
"up": "actuallyadditions:blocks/blockFluidPlacerTop",
"north": "actuallyadditions:blocks/blockFluidPlacerFront",
"east": "actuallyadditions:blocks/blockFluidPlacer",
"south": "actuallyadditions:blocks/blockFluidPlacer",
"west": "actuallyadditions:blocks/blockFluidPlacer"
}
}

12
src/main/resources/assets/actuallyadditions/models/block/blockFurnaceDouble.json Normal file
View file

@ -0,0 +1,12 @@
{
"parent": "block/cube",
"textures": {
"particle": "actuallyadditions:blocks/blockFurnaceDouble",
"down": "actuallyadditions:blocks/blockFurnaceDouble",
"up": "actuallyadditions:blocks/blockFurnaceDoubleTop",
"north": "actuallyadditions:blocks/blockFurnaceDoubleFront",
"east": "actuallyadditions:blocks/blockFurnaceDouble",
"south": "actuallyadditions:blocks/blockFurnaceDouble",
"west": "actuallyadditions:blocks/blockFurnaceDouble"
}
}

12
src/main/resources/assets/actuallyadditions/models/block/blockFurnaceDoubleOn.json Normal file
View file

@ -0,0 +1,12 @@
{
"parent": "block/cube",
"textures": {
"particle": "actuallyadditions:blocks/blockFurnaceDouble",
"down": "actuallyadditions:blocks/blockFurnaceDouble",
"up": "actuallyadditions:blocks/blockFurnaceDoubleTop",
"north": "actuallyadditions:blocks/blockFurnaceDoubleOn",
"east": "actuallyadditions:blocks/blockFurnaceDouble",
"south": "actuallyadditions:blocks/blockFurnaceDouble",
"west": "actuallyadditions:blocks/blockFurnaceDouble"
}
}

12
src/main/resources/assets/actuallyadditions/models/block/blockGiantChest.json Normal file
View file

@ -0,0 +1,12 @@
{
"parent": "block/cube",
"textures": {
"particle": "actuallyadditions:blocks/blockGiantChest",
"down": "actuallyadditions:blocks/blockGiantChestBottom",
"up": "actuallyadditions:blocks/blockGiantChestTop",
"north": "actuallyadditions:blocks/blockGiantChest",
"east": "actuallyadditions:blocks/blockGiantChest",
"south": "actuallyadditions:blocks/blockGiantChest",
"west": "actuallyadditions:blocks/blockGiantChest"
}
}

6
src/main/resources/assets/actuallyadditions/models/block/blockGreenhouseGlass.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "actuallyadditions:blocks/blockGreenhouseGlass"
}
}

12
src/main/resources/assets/actuallyadditions/models/block/blockGrinderDouble.json Normal file
View file

@ -0,0 +1,12 @@
{
"parent": "block/cube",
"textures": {
"particle": "actuallyadditions:blocks/blockGrinderDouble",
"down": "actuallyadditions:blocks/blockGrinderBottom",
"up": "actuallyadditions:blocks/blockGrinderTop",
"north": "actuallyadditions:blocks/blockGrinderDouble",
"east": "actuallyadditions:blocks/blockGrinderDouble",
"south": "actuallyadditions:blocks/blockGrinderDouble",
"west": "actuallyadditions:blocks/blockGrinderDouble"
}
}

12
src/main/resources/assets/actuallyadditions/models/block/blockGrinderDoubleOn.json Normal file
View file

@ -0,0 +1,12 @@
{
"parent": "block/cube",
"textures": {
"particle": "actuallyadditions:blocks/blockGrinderDouble",
"down": "actuallyadditions:blocks/blockGrinderBottom",
"up": "actuallyadditions:blocks/blockGrinderOn",
"north": "actuallyadditions:blocks/blockGrinderDouble",
"east": "actuallyadditions:blocks/blockGrinderDouble",
"south": "actuallyadditions:blocks/blockGrinderDouble",
"west": "actuallyadditions:blocks/blockGrinderDouble"
}
}

12
src/main/resources/assets/actuallyadditions/models/block/blockHeatCollector.json Normal file
View file

@ -0,0 +1,12 @@
{
"parent": "block/cube",
"textures": {
"particle": "actuallyadditions:blocks/blockHeatCollectorSide",
"down": "actuallyadditions:blocks/blockHeatCollectorBottom",
"up": "actuallyadditions:blocks/blockHeatCollectorTop",
"north": "actuallyadditions:blocks/blockHeatCollectorSide",
"east": "actuallyadditions:blocks/blockHeatCollectorSide",
"south": "actuallyadditions:blocks/blockHeatCollectorSide",
"west": "actuallyadditions:blocks/blockHeatCollectorSide"
}
}

12
src/main/resources/assets/actuallyadditions/models/block/blockItemRepairer.json Normal file
View file

@ -0,0 +1,12 @@
{
"parent": "block/cube",
"textures": {
"particle": "actuallyadditions:blocks/blockItemRepairer",
"down": "actuallyadditions:blocks/blockItemRepairerBottom",
"up": "actuallyadditions:blocks/blockItemRepairerTop",
"north": "actuallyadditions:blocks/blockItemRepairer",
"east": "actuallyadditions:blocks/blockItemRepairer",
"south": "actuallyadditions:blocks/blockItemRepairer",
"west": "actuallyadditions:blocks/blockItemRepairer"
}
}

12
src/main/resources/assets/actuallyadditions/models/block/blockLampPowerer.json Normal file
View file

@ -0,0 +1,12 @@
{
"parent": "block/cube",
"textures": {
"particle": "actuallyadditions:blocks/blockLampPowerer",
"down": "actuallyadditions:blocks/blockLampPowerer",
"up": "actuallyadditions:blocks/blockLampPowerer",
"north": "actuallyadditions:blocks/blockLampPowererFront",
"east": "actuallyadditions:blocks/blockLampPowerer",
"south": "actuallyadditions:blocks/blockLampPowerer",
"west": "actuallyadditions:blocks/blockLampPowerer"
}
}

Some files were not shown because too many files have changed in this diff Show more