diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBookletStand.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBookletStand.java index f8e5be1f1..fcf7c5a4f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBookletStand.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBookletStand.java @@ -56,11 +56,6 @@ public class BlockBookletStand extends BlockContainerBase implements IHudDisplay return META; } - @Override - public int getRenderType(){ - return AssetUtil.TESR_RENDER_ID; - } - @Override public boolean isOpaqueCube(){ return false; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java index f11a14ab0..0bd4b2af7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java @@ -14,18 +14,18 @@ import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler; import de.ellpeck.actuallyadditions.mod.tile.TileEntityCoffeeMachine; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; 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.world.IBlockAccess; +import net.minecraft.util.MathHelper; import net.minecraft.world.World; public class BlockCoffeeMachine extends BlockContainerBase{ @@ -39,8 +39,9 @@ public class BlockCoffeeMachine extends BlockContainerBase{ this.setResistance(10.0F); this.setStepSound(soundTypeStone); - float f = 1/16F; - this.setBlockBounds(f, 0F, f, 1F-f, 1F-2*f, 1F-f); + //TODO Fix bounding box + //float f = 1/16F; + //this.setBlockBounds(f, 0F, f, 1F-f, 1F-2*f, 1F-f); } @Override @@ -48,11 +49,6 @@ public class BlockCoffeeMachine extends BlockContainerBase{ return META; } - @Override - public int getRenderType(){ - return AssetUtil.TESR_RENDER_ID; - } - @Override public boolean isOpaqueCube(){ return false; @@ -87,21 +83,22 @@ public class BlockCoffeeMachine extends BlockContainerBase{ } @Override - public void setBlockBoundsBasedOnState(IBlockAccess world, BlockPos pos){ - int meta = PosUtil.getMetadata(pos, world); - float f = 0.0625F; + 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; - if(meta == 0){ - this.setBlockBounds(0F, 0F, 0F, 1F, 1F, 1F-f*3F); + if(rotation == 0){ + PosUtil.setMetadata(pos, world, 0, 2); } - if(meta == 1){ - this.setBlockBounds(0F, 0F, 0F, 1F-f*3F, 1F, 1F); + if(rotation == 1){ + PosUtil.setMetadata(pos, world, 3, 2); } - if(meta == 2){ - this.setBlockBounds(0F, 0F, f*3F, 1F, 1F, 1F); + if(rotation == 2){ + PosUtil.setMetadata(pos, world, 1, 2); } - if(meta == 3){ - this.setBlockBounds(f*3F, 0F, 0F, 1F, 1F, 1F); + if(rotation == 3){ + PosUtil.setMetadata(pos, world, 2, 2); } + + super.onBlockPlacedBy(world, pos, state, player, stack); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCompost.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCompost.java index b6bd79a05..105d54e16 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCompost.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCompost.java @@ -47,11 +47,6 @@ public class BlockCompost extends BlockContainerBase implements IHudDisplay{ this.setBlockBoundsForItemRender(); } - @Override - public int getRenderType(){ - return AssetUtil.TESR_RENDER_ID; - } - @Override public void addCollisionBoxesToList(World world, BlockPos pos, IBlockState state, AxisAlignedBB mask, List list, Entity collidingEntity){ this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.3125F, 1.0F); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java index 46a0263f5..8c7b2ad22 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java @@ -22,8 +22,6 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; -import net.minecraft.world.IBlockAccess; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -51,19 +49,6 @@ public class BlockCrystal extends BlockBase{ return this.getMetaFromState(state); } - @Override - @SideOnly(Side.CLIENT) - public int getRenderColor(IBlockState state){ - int meta = this.getMetaFromState(state); - return meta >= allCrystals.length ? super.getRenderColor(state) : allCrystals[meta].color; - } - - @Override - @SideOnly(Side.CLIENT) - public int colorMultiplier(IBlockAccess world, BlockPos pos, int renderPass){ - return this.getRenderColor(world.getBlockState(pos)); - } - @SuppressWarnings("all") @SideOnly(Side.CLIENT) public void getSubBlocks(Item item, CreativeTabs tab, List list){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFishingNet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFishingNet.java index 62ac87c7c..e4aa6604f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFishingNet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFishingNet.java @@ -12,7 +12,6 @@ package de.ellpeck.actuallyadditions.mod.blocks; import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityFishingNet; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.block.material.Material; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; @@ -35,11 +34,6 @@ public class BlockFishingNet extends BlockContainerBase{ return new TileEntityFishingNet(); } - @Override - public int getRenderType(){ - return AssetUtil.TESR_RENDER_ID; - } - @Override public boolean isOpaqueCube(){ return false; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceSolar.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceSolar.java index 0e4621239..27b1e48da 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceSolar.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceSolar.java @@ -12,7 +12,6 @@ package de.ellpeck.actuallyadditions.mod.blocks; import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityFurnaceSolar; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.block.material.Material; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; @@ -35,11 +34,6 @@ public class BlockFurnaceSolar extends BlockContainerBase{ return new TileEntityFurnaceSolar(); } - @Override - public int getRenderType(){ - return AssetUtil.TESR_RENDER_ID; - } - @Override public boolean isOpaqueCube(){ return false; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java index 7fb20b93c..4b3dedbbb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java @@ -12,7 +12,6 @@ package de.ellpeck.actuallyadditions.mod.blocks; import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelay; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import de.ellpeck.actuallyadditions.mod.util.PosUtil; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyInteger; @@ -53,11 +52,6 @@ public class BlockLaserRelay extends BlockContainerBase{ super.addCollisionBoxesToList(world, pos, state, axis, list, entity); } - @Override - public int getRenderType(){ - return AssetUtil.TESR_RENDER_ID; - } - @Override public boolean isOpaqueCube(){ return false; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantomBooster.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantomBooster.java index 0ae6f218a..3f56a5a01 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantomBooster.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantomBooster.java @@ -12,7 +12,6 @@ package de.ellpeck.actuallyadditions.mod.blocks; import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityPhantomBooster; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.block.material.Material; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; @@ -32,11 +31,6 @@ public class BlockPhantomBooster extends BlockContainerBase{ this.setBlockBounds(3*f, 0F, 3*f, 1-3*f, 1F, 1-3*f); } - @Override - public int getRenderType(){ - return AssetUtil.TESR_RENDER_ID; - } - @Override public boolean isOpaqueCube(){ return false; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSmileyCloud.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSmileyCloud.java index 3afb1cc05..7f2b2c829 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSmileyCloud.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSmileyCloud.java @@ -16,7 +16,6 @@ import de.ellpeck.actuallyadditions.mod.achievement.TheAchievements; import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler; import de.ellpeck.actuallyadditions.mod.tile.TileEntitySmileyCloud; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import de.ellpeck.actuallyadditions.mod.util.PosUtil; import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.block.material.Material; @@ -53,11 +52,6 @@ public class BlockSmileyCloud extends BlockContainerBase{ return META; } - @Override - public int getRenderType(){ - return AssetUtil.TESR_RENDER_ID; - } - @Override public boolean isOpaqueCube(){ return false; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/FluidAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/FluidAA.java index 8f81a2617..e38856c67 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/FluidAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/FluidAA.java @@ -17,7 +17,7 @@ import net.minecraftforge.fluids.Fluid; public class FluidAA extends Fluid{ public FluidAA(String fluidName, String textureName){ - super(fluidName, new ResourceLocation(ModUtil.MOD_ID_LOWER, "textures/blocks/"+textureName+"Still.png"), new ResourceLocation(ModUtil.MOD_ID_LOWER, "textures/blocks/"+textureName+"Flowing.png")); + super(fluidName, new ResourceLocation(ModUtil.MOD_ID_LOWER, "blocks/"+textureName+"Still"), new ResourceLocation(ModUtil.MOD_ID_LOWER, "blocks/"+textureName+"Flowing")); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockFluidFlowing.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockFluidFlowing.java index 5c27d120c..d4705287f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockFluidFlowing.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockFluidFlowing.java @@ -11,7 +11,6 @@ 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 de.ellpeck.actuallyadditions.mod.util.PosUtil; @@ -19,7 +18,6 @@ import net.minecraft.block.material.Material; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fluids.BlockFluidClassic; @@ -33,7 +31,7 @@ public class BlockFluidFlowing extends BlockFluidClassic{ public BlockFluidFlowing(Fluid fluid, Material material, String unlocalizedName){ super(fluid, material); this.name = unlocalizedName; - displacements.put(this, false); + this.displacements.put(this, false); this.register(); } @@ -47,12 +45,6 @@ public class BlockFluidFlowing extends BlockFluidClassic{ 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(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java index 01d82845f..06d0a3333 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java @@ -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("", OreGen.QUARTZ_MIN).addTextReplacement("", 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().setIncomplete(); + new BookletChapter("cloud", ActuallyAdditionsAPI.entryMisc, new ItemStack(InitBlocks.blockSmileyCloud), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeSmileyCloud).setNoText().setPageStacksWildcard()).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 lampPages = new ArrayList(); lampPages.add(new PageTextOnly(lampPages.size()+1)); @@ -95,7 +95,7 @@ public class InitBooklet{ new BookletChapter("phantomfaces", ActuallyAdditionsAPI.entryFunctionalNonRF, new ItemStack(InitBlocks.blockPhantomLiquiface), new PageTextOnly(1).addTextReplacement("", TileEntityPhantomface.RANGE), new PageTextOnly(2), new PageCrafting(3, BlockCrafting.recipePhantomface), new PageCrafting(4, BlockCrafting.recipeLiquiface), new PageCrafting(5, BlockCrafting.recipeEnergyface), new PageCrafting(6, ItemCrafting.recipePhantomConnector).setNoText(), new PageCrafting(7, BlockCrafting.recipePhantomBooster)).setImportant(); new BookletChapter("phantomBreaker", ActuallyAdditionsAPI.entryFunctionalNonRF, new ItemStack(InitBlocks.blockPhantomBreaker), new PageTextOnly(1).addTextReplacement("", TileEntityPhantomPlacer.RANGE), new PageCrafting(2, BlockCrafting.recipePhantomPlacer).setNoText(), new PageCrafting(3, BlockCrafting.recipePhantomBreaker).setNoText()); new BookletChapter("esd", ActuallyAdditionsAPI.entryFunctionalNonRF, new ItemStack(InitBlocks.blockInputterAdvanced), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeESD).setNoText(), new PageCrafting(3, BlockCrafting.recipeAdvancedESD).setNoText()).setSpecial(); - new BookletChapter("xpSolidifier", ActuallyAdditionsAPI.entryFunctionalNonRF, new ItemStack(InitBlocks.blockXPSolidifier), new PageTextOnly(1).setStack(new ItemStack(InitItems.itemSolidifiedExperience)), new PageCrafting(2, BlockCrafting.recipeSolidifier).setNoText()).setSpecial(); + new BookletChapter("xpSolidifier", ActuallyAdditionsAPI.entryFunctionalNonRF, new ItemStack(InitBlocks.blockXPSolidifier), new PageTextOnly(1).setStack(new ItemStack(InitItems.itemSolidifiedExperience)), new PageCrafting(2, BlockCrafting.recipeSolidifier).setNoText()).setSpecial().setIncomplete(); 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()); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDust.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDust.java index 507da0834..1ba612d18 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDust.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDust.java @@ -10,13 +10,16 @@ package de.ellpeck.actuallyadditions.mod.items; +import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; import de.ellpeck.actuallyadditions.mod.items.metalists.TheDusts; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import de.ellpeck.actuallyadditions.mod.util.StringUtil; 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; @@ -59,4 +62,11 @@ public class ItemDust extends ItemBase{ list.add(new ItemStack(this, 1, j)); } } + + @Override + protected void registerRendering(){ + for(int i = 0; i < allDusts.length; i++){ + ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this, 1, i), new ResourceLocation(ModUtil.MOD_ID_LOWER, this.getBaseName())); + } + } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java index a9c786362..43448210e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java @@ -10,10 +10,11 @@ package de.ellpeck.actuallyadditions.mod.items; +import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.items.base.ItemFoodBase; import de.ellpeck.actuallyadditions.mod.items.metalists.TheFoods; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import de.ellpeck.actuallyadditions.mod.util.StringUtil; -import net.minecraft.client.Minecraft; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -21,6 +22,7 @@ import net.minecraft.item.EnumAction; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -31,8 +33,6 @@ public class ItemFoods extends ItemFoodBase{ public static final TheFoods[] allFoods = TheFoods.values(); - private static final String ELLSPECK = "ellspeck"; - public ItemFoods(String name){ super(0, 0.0F, false, name); this.setHasSubtypes(true); @@ -100,11 +100,13 @@ public class ItemFoods extends ItemFoodBase{ } @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool){ - if(stack.getItemDamage() == TheFoods.BACON.ordinal() && StringUtil.equalsToLowerCase(stack.getDisplayName(), ELLSPECK)){ - String strg = "Yes, this is an ugly texture of bacon with its legs behind its head. This is an homage to Ellpeck, the mod author, being able to put his legs behind his head. Wasn't my idea, so don't judge me."; - list.addAll(Minecraft.getMinecraft().fontRendererObj.listFormattedStringToWidth(strg, 200)); + protected void registerRendering(){ + ResourceLocation[] resLocs = new ResourceLocation[allFoods.length]; + for(int i = 0; i < allFoods.length; i++){ + String name = this.getBaseName()+allFoods[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); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java index 981cc862a..474e97826 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java @@ -10,13 +10,16 @@ package de.ellpeck.actuallyadditions.mod.items; +import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import de.ellpeck.actuallyadditions.mod.util.StringUtil; 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; @@ -53,4 +56,15 @@ public class ItemMisc extends ItemBase{ list.add(new ItemStack(this, 1, j)); } } + + @Override + protected void registerRendering(){ + ResourceLocation[] resLocs = new ResourceLocation[allMiscItems.length]; + for(int i = 0; i < allMiscItems.length; i++){ + String name = this.getBaseName()+allMiscItems[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); + } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSeed.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSeed.java similarity index 85% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSeed.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSeed.java index 137030382..6ade78b73 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSeed.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSeed.java @@ -8,8 +8,9 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.mod.items; +package de.ellpeck.actuallyadditions.mod.items.base; +import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.blocks.base.BlockPlant; import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; import de.ellpeck.actuallyadditions.mod.util.ModUtil; @@ -21,6 +22,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemSeeds; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.IBlockAccess; import net.minecraftforge.fml.common.registry.GameRegistry; @@ -51,6 +53,12 @@ public class ItemSeed extends ItemSeeds{ if(this.shouldAddCreative()){ this.setCreativeTab(CreativeTab.instance); } + + this.registerRendering(); + } + + protected void registerRendering(){ + ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this), new ResourceLocation(ModUtil.MOD_ID_LOWER, this.getBaseName())); } protected String getBaseName(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheCrystals.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheCrystals.java index eb285b9d5..ab719ca13 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheCrystals.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheCrystals.java @@ -15,20 +15,18 @@ import net.minecraft.item.EnumRarity; public enum TheCrystals{ - REDSTONE("Red", Util.CRYSTAL_RED_RARITY, 16318464), - LAPIS("Blue", Util.CRYSTAL_BLUE_RARITY, 131437), - DIAMOND("LightBlue", Util.CRYSTAL_LIGHT_BLUE_RARITY, 9211636), - COAL("Black", Util.CRYSTAL_BLACK_RARITY, 986895), - EMERALD("Green", Util.CRYSTAL_GREEN_RARITY, 382466), - IRON("White", Util.CRYSTAL_WHITE_RARITY, 11053224); + REDSTONE("Red", Util.CRYSTAL_RED_RARITY), + LAPIS("Blue", Util.CRYSTAL_BLUE_RARITY), + DIAMOND("LightBlue", Util.CRYSTAL_LIGHT_BLUE_RARITY), + COAL("Black", Util.CRYSTAL_BLACK_RARITY), + EMERALD("Green", Util.CRYSTAL_GREEN_RARITY), + IRON("White", Util.CRYSTAL_WHITE_RARITY); public final String name; public final EnumRarity rarity; - public final int color; - TheCrystals(String name, EnumRarity rarity, int color){ + TheCrystals(String name, EnumRarity rarity){ this.name = name; this.rarity = rarity; - this.color = color; } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java b/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java index 7abe85c17..f57ca9330 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java @@ -11,17 +11,22 @@ package de.ellpeck.actuallyadditions.mod.proxy; +import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; 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.util.FluidStateMapper; import de.ellpeck.actuallyadditions.mod.util.ModUtil; import de.ellpeck.actuallyadditions.mod.util.playerdata.PersistentClientData; +import net.minecraft.block.Block; import net.minecraft.client.Minecraft; 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.util.ResourceLocation; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; @@ -60,6 +65,21 @@ public class ClientProxy implements IProxy{ for(Map.Entry entry : modelVariantsForRegistering.entrySet()){ ModelBakery.registerItemVariants(entry.getKey(), entry.getValue()); } + + this.registerCustomFluidBlockRenderer(InitBlocks.fluidCanolaOil); + this.registerCustomFluidBlockRenderer(InitBlocks.fluidOil); + } + + /** + * (Excerpted from Tinkers' Construct with permission, thanks guys!) + */ + private void registerCustomFluidBlockRenderer(Fluid fluid){ + Block block = fluid.getBlock(); + Item item = Item.getItemFromBlock(block); + FluidStateMapper mapper = new FluidStateMapper(fluid); + ModelLoader.registerItemVariants(item); + ModelLoader.setCustomMeshDefinition(item, mapper); + ModelLoader.setCustomStateMapper(block, mapper); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java index 3eee47264..a9b5e8b64 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java @@ -26,10 +26,10 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +@SideOnly(Side.CLIENT) public class AssetUtil{ public static final ResourceLocation GUI_INVENTORY_LOCATION = getGuiLocation("guiInventory"); - public static final int TESR_RENDER_ID = 2; public static ResourceLocation getGuiLocation(String file){ return new ResourceLocation(ModUtil.MOD_ID_LOWER, "textures/gui/"+file+".png"); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/CompatUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/CompatUtil.java index 16d4cb058..6a3a9e63e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/CompatUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/CompatUtil.java @@ -10,7 +10,7 @@ package de.ellpeck.actuallyadditions.mod.util; -import de.ellpeck.actuallyadditions.mod.items.ItemSeed; +import de.ellpeck.actuallyadditions.mod.items.base.ItemSeed; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/FluidStateMapper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/FluidStateMapper.java new file mode 100644 index 000000000..78b6a624c --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/FluidStateMapper.java @@ -0,0 +1,48 @@ +/* + * This file ("FluidStateMapper.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.util; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.ItemMeshDefinition; +import net.minecraft.client.renderer.block.statemap.StateMapperBase; +import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +/** + * (Excerpted from Tinkers' Construct with permission, thanks guys!) + */ +@SideOnly(Side.CLIENT) +public class FluidStateMapper extends StateMapperBase implements ItemMeshDefinition{ + + public final Fluid fluid; + public final ModelResourceLocation location; + + public FluidStateMapper(Fluid fluid){ + this.fluid = fluid; + + // have each block hold its fluid per nbt? hm + this.location = new ModelResourceLocation(new ResourceLocation(ModUtil.MOD_ID_LOWER, "fluids"), fluid.getName()); + } + + @Override + protected ModelResourceLocation getModelResourceLocation(IBlockState state){ + return location; + } + + @Override + public ModelResourceLocation getModelLocation(ItemStack stack){ + return location; + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/KeyUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/KeyUtil.java index 171bfe554..33cb3886c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/KeyUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/KeyUtil.java @@ -10,8 +10,11 @@ package de.ellpeck.actuallyadditions.mod.util; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; +@SideOnly(Side.CLIENT) public class KeyUtil{ public static boolean isShiftPressed(){ diff --git a/src/main/resources/assets/actuallyadditions/blockstates/fluids.json b/src/main/resources/assets/actuallyadditions/blockstates/fluids.json new file mode 100644 index 000000000..f7b6199fd --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/fluids.json @@ -0,0 +1,13 @@ +{ + "forge_marker": 1, + "variants": { + "canolaoil": { + "model": "forge:fluid", + "custom": { "fluid": "canolaoil" } + }, + "oil": { + "model": "forge:fluid", + "custom": { "fluid": "oil" } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockCoffeeMachine.json b/src/main/resources/assets/actuallyadditions/models/block/blockCoffeeMachine.json index 1788a503b..64fc6e863 100644 --- a/src/main/resources/assets/actuallyadditions/models/block/blockCoffeeMachine.json +++ b/src/main/resources/assets/actuallyadditions/models/block/blockCoffeeMachine.json @@ -2,6 +2,7 @@ "__createdwith": "opl's Model Creator", "ambientocclusion": false, "textures": { + "particle": "actuallyadditions:blocks/models/modelCoffeeMachine", "coffeeMachine": "actuallyadditions:blocks/models/modelCoffeeMachine" }, "elements": [ diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemCanolaSeed.json b/src/main/resources/assets/actuallyadditions/models/item/itemCanolaSeed.json new file mode 100644 index 000000000..abdbde44c --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemCanolaSeed.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemCanolaSeed" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemCoffee.json b/src/main/resources/assets/actuallyadditions/models/item/itemCoffee.json new file mode 100644 index 000000000..0779c17c6 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemCoffee.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemCoffee" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemCoffeeSeed.json b/src/main/resources/assets/actuallyadditions/models/item/itemCoffeeSeed.json new file mode 100644 index 000000000..7ac254b06 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemCoffeeSeed.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemCoffeeSeed" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemCrafterOnAStick.json b/src/main/resources/assets/actuallyadditions/models/item/itemCrafterOnAStick.json new file mode 100644 index 000000000..81db3445f --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemCrafterOnAStick.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemCrafterOnAStick" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemDust.json b/src/main/resources/assets/actuallyadditions/models/item/itemDust.json new file mode 100644 index 000000000..c97b4b7d1 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemDust.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemDust" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemFertilizer.json b/src/main/resources/assets/actuallyadditions/models/item/itemFertilizer.json new file mode 100644 index 000000000..21e5e68d3 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemFertilizer.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemFertilizer" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemFlaxSeed.json b/src/main/resources/assets/actuallyadditions/models/item/itemFlaxSeed.json new file mode 100644 index 000000000..0087d9527 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemFlaxSeed.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemFlaxSeed" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemFoodBacon.json b/src/main/resources/assets/actuallyadditions/models/item/itemFoodBacon.json new file mode 100644 index 000000000..5eed1f061 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemFoodBacon.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemFoodBacon" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemFoodBaguette.json b/src/main/resources/assets/actuallyadditions/models/item/itemFoodBaguette.json new file mode 100644 index 000000000..b9d80c5f0 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemFoodBaguette.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemFoodBaguette" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemFoodBigCookie.json b/src/main/resources/assets/actuallyadditions/models/item/itemFoodBigCookie.json new file mode 100644 index 000000000..b2d339305 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemFoodBigCookie.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemFoodBigCookie" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemFoodCarrotJuice.json b/src/main/resources/assets/actuallyadditions/models/item/itemFoodCarrotJuice.json new file mode 100644 index 000000000..a493df9f4 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemFoodCarrotJuice.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemFoodCarrotJuice" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemFoodCheese.json b/src/main/resources/assets/actuallyadditions/models/item/itemFoodCheese.json new file mode 100644 index 000000000..b6fb363ac --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemFoodCheese.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemFoodCheese" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemFoodChocolate.json b/src/main/resources/assets/actuallyadditions/models/item/itemFoodChocolate.json new file mode 100644 index 000000000..458ceb6ac --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemFoodChocolate.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemFoodChocolate" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemFoodChocolateCake.json b/src/main/resources/assets/actuallyadditions/models/item/itemFoodChocolateCake.json new file mode 100644 index 000000000..6d68ecd01 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemFoodChocolateCake.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemFoodChocolateCake" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemFoodChocolateToast.json b/src/main/resources/assets/actuallyadditions/models/item/itemFoodChocolateToast.json new file mode 100644 index 000000000..79f80256a --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemFoodChocolateToast.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemFoodChocolateToast" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemFoodDoughnut.json b/src/main/resources/assets/actuallyadditions/models/item/itemFoodDoughnut.json new file mode 100644 index 000000000..c1192cfca --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemFoodDoughnut.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemFoodDoughnut" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemFoodFishNChips.json b/src/main/resources/assets/actuallyadditions/models/item/itemFoodFishNChips.json new file mode 100644 index 000000000..09b781a3b --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemFoodFishNChips.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemFoodFishNChips" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemFoodFrenchFries.json b/src/main/resources/assets/actuallyadditions/models/item/itemFoodFrenchFries.json new file mode 100644 index 000000000..9e854d5a3 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemFoodFrenchFries.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemFoodFrenchFries" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemFoodFrenchFry.json b/src/main/resources/assets/actuallyadditions/models/item/itemFoodFrenchFry.json new file mode 100644 index 000000000..0670a6565 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemFoodFrenchFry.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemFoodFrenchFry" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemFoodHamburger.json b/src/main/resources/assets/actuallyadditions/models/item/itemFoodHamburger.json new file mode 100644 index 000000000..400e7218e --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemFoodHamburger.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemFoodHamburger" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemFoodNoodle.json b/src/main/resources/assets/actuallyadditions/models/item/itemFoodNoodle.json new file mode 100644 index 000000000..4b6894d91 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemFoodNoodle.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemFoodNoodle" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemFoodPizza.json b/src/main/resources/assets/actuallyadditions/models/item/itemFoodPizza.json new file mode 100644 index 000000000..a6b4c00d0 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemFoodPizza.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemFoodPizza" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemFoodPumpkinStew.json b/src/main/resources/assets/actuallyadditions/models/item/itemFoodPumpkinStew.json new file mode 100644 index 000000000..2f2a0ec88 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemFoodPumpkinStew.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemFoodPumpkinStew" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemFoodRice.json b/src/main/resources/assets/actuallyadditions/models/item/itemFoodRice.json new file mode 100644 index 000000000..7a28939c8 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemFoodRice.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemFoodRice" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemFoodRiceBread.json b/src/main/resources/assets/actuallyadditions/models/item/itemFoodRiceBread.json new file mode 100644 index 000000000..f8ce8ddc9 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemFoodRiceBread.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemFoodRiceBread" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemFoodSpaghetti.json b/src/main/resources/assets/actuallyadditions/models/item/itemFoodSpaghetti.json new file mode 100644 index 000000000..c198d5688 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemFoodSpaghetti.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemFoodSpaghetti" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemFoodSubmarineSandwich.json b/src/main/resources/assets/actuallyadditions/models/item/itemFoodSubmarineSandwich.json new file mode 100644 index 000000000..11b9c1390 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemFoodSubmarineSandwich.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemFoodSubmarineSandwich" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemFoodToast.json b/src/main/resources/assets/actuallyadditions/models/item/itemFoodToast.json new file mode 100644 index 000000000..ec7d7d946 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemFoodToast.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemFoodToast" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemHairyBall.json b/src/main/resources/assets/actuallyadditions/models/item/itemHairyBall.json new file mode 100644 index 000000000..1b6d96ec5 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemHairyBall.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemHairyBall" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemKnife.json b/src/main/resources/assets/actuallyadditions/models/item/itemKnife.json new file mode 100644 index 000000000..81ffc94b6 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemKnife.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemKnife" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemMiscBatWing.json b/src/main/resources/assets/actuallyadditions/models/item/itemMiscBatWing.json new file mode 100644 index 000000000..dd74c149c --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemMiscBatWing.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemMiscBatWing" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemMiscBlackDye.json b/src/main/resources/assets/actuallyadditions/models/item/itemMiscBlackDye.json new file mode 100644 index 000000000..253063d7e --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemMiscBlackDye.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemMiscBlackDye" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemMiscBlackQuartz.json b/src/main/resources/assets/actuallyadditions/models/item/itemMiscBlackQuartz.json new file mode 100644 index 000000000..aa5416518 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemMiscBlackQuartz.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemMiscBlackQuartz" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemMiscCanola.json b/src/main/resources/assets/actuallyadditions/models/item/itemMiscCanola.json new file mode 100644 index 000000000..26df9bc37 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemMiscCanola.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemMiscCanola" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemMiscCoil.json b/src/main/resources/assets/actuallyadditions/models/item/itemMiscCoil.json new file mode 100644 index 000000000..9ea7a8ed8 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemMiscCoil.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemMiscCoil" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemMiscCoilAdvanced.json b/src/main/resources/assets/actuallyadditions/models/item/itemMiscCoilAdvanced.json new file mode 100644 index 000000000..4f695ffd7 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemMiscCoilAdvanced.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemMiscCoilAdvanced" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemMiscCup.json b/src/main/resources/assets/actuallyadditions/models/item/itemMiscCup.json new file mode 100644 index 000000000..ae0e7b67b --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemMiscCup.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemMiscCup" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemMiscDough.json b/src/main/resources/assets/actuallyadditions/models/item/itemMiscDough.json new file mode 100644 index 000000000..ae5b963cf --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemMiscDough.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemMiscDough" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemMiscDrillCore.json b/src/main/resources/assets/actuallyadditions/models/item/itemMiscDrillCore.json new file mode 100644 index 000000000..06b4afe88 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemMiscDrillCore.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemMiscDrillCore" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemMiscKnifeBlade.json b/src/main/resources/assets/actuallyadditions/models/item/itemMiscKnifeBlade.json new file mode 100644 index 000000000..022ef9ef2 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemMiscKnifeBlade.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemMiscKnifeBlade" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemMiscKnifeHandle.json b/src/main/resources/assets/actuallyadditions/models/item/itemMiscKnifeHandle.json new file mode 100644 index 000000000..a32e370c1 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemMiscKnifeHandle.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemMiscKnifeHandle" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemMiscLens.json b/src/main/resources/assets/actuallyadditions/models/item/itemMiscLens.json new file mode 100644 index 000000000..1ae2e96f0 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemMiscLens.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemMiscLens" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemMiscMashedFood.json b/src/main/resources/assets/actuallyadditions/models/item/itemMiscMashedFood.json new file mode 100644 index 000000000..b3b778f22 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemMiscMashedFood.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemMiscMashedFood" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemMiscPaperCone.json b/src/main/resources/assets/actuallyadditions/models/item/itemMiscPaperCone.json new file mode 100644 index 000000000..24b378ed8 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemMiscPaperCone.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemMiscPaperCone" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemMiscRiceDough.json b/src/main/resources/assets/actuallyadditions/models/item/itemMiscRiceDough.json new file mode 100644 index 000000000..4123b88da --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemMiscRiceDough.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemMiscRiceDough" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemMiscRiceSlime.json b/src/main/resources/assets/actuallyadditions/models/item/itemMiscRiceSlime.json new file mode 100644 index 000000000..f20e1520f --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemMiscRiceSlime.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemMiscRiceSlime" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemMiscRing.json b/src/main/resources/assets/actuallyadditions/models/item/itemMiscRing.json new file mode 100644 index 000000000..ded1c493e --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemMiscRing.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemMiscRing" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemMiscTinyCharcoal.json b/src/main/resources/assets/actuallyadditions/models/item/itemMiscTinyCharcoal.json new file mode 100644 index 000000000..430bb6df2 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemMiscTinyCharcoal.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemMiscTinyCharcoal" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemMiscTinyCoal.json b/src/main/resources/assets/actuallyadditions/models/item/itemMiscTinyCoal.json new file mode 100644 index 000000000..065e3d543 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemMiscTinyCoal.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemMiscTinyCoal" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemResonantRice.json b/src/main/resources/assets/actuallyadditions/models/item/itemResonantRice.json new file mode 100644 index 000000000..2454d8596 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemResonantRice.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemResonantRice" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemEllspeck.png b/src/main/resources/assets/actuallyadditions/textures/items/itemEllspeck.png deleted file mode 100644 index e2ae5d1aa..000000000 Binary files a/src/main/resources/assets/actuallyadditions/textures/items/itemEllspeck.png and /dev/null differ