From 8f959c92aa25ce599e0a0d4b554e4c4c128b3f83 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Fri, 8 Jan 2016 21:55:39 +0100 Subject: [PATCH] =?UTF-8?q?More=20Fixes=20=C2=B0~=C2=B0=20Continuing=20som?= =?UTF-8?q?e=20other=20time.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mod/blocks/BlockCoffeeMachine.java | 26 ++++++++--------- .../mod/blocks/BlockColoredLamp.java | 29 ++++++++++--------- .../mod/booklet/BookletUtils.java | 17 ++++++++++- .../mod/booklet/entry/BookletEntry.java | 5 ---- .../booklet/entry/BookletEntryAllSearch.java | 4 +-- .../mod/creative/CreativeTab.java | 1 + .../tile/TileEntityDirectionalBreaker.java | 2 +- .../actuallyadditions/mod/util/WorldUtil.java | 2 +- .../item/blockColoredLampLightGray.json | 2 +- .../models/item/blockColoredLampOnBlack.json | 10 +++++++ .../models/item/blockColoredLampOnBlue.json | 10 +++++++ .../models/item/blockColoredLampOnBrown.json | 10 +++++++ .../models/item/blockColoredLampOnCyan.json | 10 +++++++ .../models/item/blockColoredLampOnGray.json | 10 +++++++ .../models/item/blockColoredLampOnGreen.json | 10 +++++++ .../item/blockColoredLampOnLightBlue.json | 10 +++++++ .../item/blockColoredLampOnLightGray.json | 10 +++++++ .../models/item/blockColoredLampOnLime.json | 10 +++++++ .../item/blockColoredLampOnMagenta.json | 10 +++++++ .../models/item/blockColoredLampOnOrange.json | 10 +++++++ .../models/item/blockColoredLampOnPink.json | 10 +++++++ .../models/item/blockColoredLampOnPurple.json | 10 +++++++ .../models/item/blockColoredLampOnRed.json | 10 +++++++ .../models/item/blockColoredLampOnWhite.json | 10 +++++++ .../models/item/blockColoredLampOnYellow.json | 10 +++++++ .../models/item/blockColoredLampRed.json | 10 +++++++ .../models/item/blockColoredLampWhite.json | 2 +- 27 files changed, 221 insertions(+), 39 deletions(-) create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnBlack.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnBlue.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnBrown.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnCyan.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnGray.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnGreen.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnLightBlue.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnLightGray.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnLime.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnMagenta.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnOrange.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnPink.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnPurple.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnRed.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnWhite.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnYellow.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockColoredLampRed.json 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 c27be20aa..f11a14ab0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java @@ -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); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java index 8ae5cfd8b..267c23653 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java @@ -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; } } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/BookletUtils.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/BookletUtils.java index a1705812f..2e970c778 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/BookletUtils.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/BookletUtils.java @@ -206,7 +206,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 +219,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); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/BookletEntry.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/BookletEntry.java index 6792f02bc..e28709ee5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/BookletEntry.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/BookletEntry.java @@ -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(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/BookletEntryAllSearch.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/BookletEntryAllSearch.java index ba7e20adb..89611c055 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/BookletEntryAllSearch.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/BookletEntryAllSearch.java @@ -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)this.allChapters.clone(); } @@ -34,5 +33,6 @@ public class BookletEntryAllSearch extends BookletEntry{ @Override public void setChapters(List chapters){ this.allChapters = (ArrayList)chapters; + this.chapters = (ArrayList)this.allChapters.clone(); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java b/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java index 3db5c496e..19370cc0f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java @@ -118,6 +118,7 @@ public class CreativeTab extends CreativeTabs{ add(InitBlocks.blockPillarQuartzSlab); add(InitBlocks.blockColoredLamp); + add(InitBlocks.blockColoredLampOn); add(InitBlocks.blockLampPowerer); add(InitBlocks.blockTreasureChest); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDirectionalBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDirectionalBreaker.java index b5c37fb0d..255b62b43 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDirectionalBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDirectionalBreaker.java @@ -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); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java index 73ddb426c..f4f8f69f5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java @@ -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); } } diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampLightGray.json b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampLightGray.json index 5eba54608..993687c00 100644 --- a/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampLightGray.json +++ b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampLightGray.json @@ -1,5 +1,5 @@ { - "parent": "actuallyadditions:block/blockColoredLampGray", + "parent": "actuallyadditions:block/blockColoredLampLightGray", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnBlack.json b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnBlack.json new file mode 100644 index 000000000..6a7c7f02a --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnBlack.json @@ -0,0 +1,10 @@ +{ + "parent": "actuallyadditions:block/blockColoredLampBlackOn", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnBlue.json b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnBlue.json new file mode 100644 index 000000000..5b0982dec --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnBlue.json @@ -0,0 +1,10 @@ +{ + "parent": "actuallyadditions:block/blockColoredLampBlueOn", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnBrown.json b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnBrown.json new file mode 100644 index 000000000..f2dedc045 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnBrown.json @@ -0,0 +1,10 @@ +{ + "parent": "actuallyadditions:block/blockColoredLampBrownOn", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnCyan.json b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnCyan.json new file mode 100644 index 000000000..69b37a498 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnCyan.json @@ -0,0 +1,10 @@ +{ + "parent": "actuallyadditions:block/blockColoredLampCyanOn", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnGray.json b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnGray.json new file mode 100644 index 000000000..61bd6f1ec --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnGray.json @@ -0,0 +1,10 @@ +{ + "parent": "actuallyadditions:block/blockColoredLampGrayOn", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnGreen.json b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnGreen.json new file mode 100644 index 000000000..f9c60d055 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnGreen.json @@ -0,0 +1,10 @@ +{ + "parent": "actuallyadditions:block/blockColoredLampGreenOn", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnLightBlue.json b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnLightBlue.json new file mode 100644 index 000000000..d59eba11b --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnLightBlue.json @@ -0,0 +1,10 @@ +{ + "parent": "actuallyadditions:block/blockColoredLampLightBlueOn", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnLightGray.json b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnLightGray.json new file mode 100644 index 000000000..bd587fe0a --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnLightGray.json @@ -0,0 +1,10 @@ +{ + "parent": "actuallyadditions:block/blockColoredLampLightGrayOn", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnLime.json b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnLime.json new file mode 100644 index 000000000..1d834b89c --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnLime.json @@ -0,0 +1,10 @@ +{ + "parent": "actuallyadditions:block/blockColoredLampLimeOn", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnMagenta.json b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnMagenta.json new file mode 100644 index 000000000..5516a153e --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnMagenta.json @@ -0,0 +1,10 @@ +{ + "parent": "actuallyadditions:block/blockColoredLampMagentaOn", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnOrange.json b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnOrange.json new file mode 100644 index 000000000..6b2e9eff8 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnOrange.json @@ -0,0 +1,10 @@ +{ + "parent": "actuallyadditions:block/blockColoredLampOrangeOn", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnPink.json b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnPink.json new file mode 100644 index 000000000..560285709 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnPink.json @@ -0,0 +1,10 @@ +{ + "parent": "actuallyadditions:block/blockColoredLampPinkOn", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnPurple.json b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnPurple.json new file mode 100644 index 000000000..6d2245850 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnPurple.json @@ -0,0 +1,10 @@ +{ + "parent": "actuallyadditions:block/blockColoredLampPurpleOn", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnRed.json b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnRed.json new file mode 100644 index 000000000..ac2177757 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnRed.json @@ -0,0 +1,10 @@ +{ + "parent": "actuallyadditions:block/blockColoredLampRedOn", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnWhite.json b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnWhite.json new file mode 100644 index 000000000..70f0afd56 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnWhite.json @@ -0,0 +1,10 @@ +{ + "parent": "actuallyadditions:block/blockColoredLampWhiteOn", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnYellow.json b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnYellow.json new file mode 100644 index 000000000..a09562909 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOnYellow.json @@ -0,0 +1,10 @@ +{ + "parent": "actuallyadditions:block/blockColoredLampYellowOn", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampRed.json b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampRed.json new file mode 100644 index 000000000..6970acda8 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampRed.json @@ -0,0 +1,10 @@ +{ + "parent": "actuallyadditions:block/blockColoredLampRed", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampWhite.json b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampWhite.json index 5a8626d73..4467915d8 100644 --- a/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampWhite.json +++ b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampWhite.json @@ -1,5 +1,5 @@ { - "parent": "actuallyadditions:block/blockColoredLampWhite-", + "parent": "actuallyadditions:block/blockColoredLampWhite", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ],