diff --git a/src/main/java/net/zepalesque/redux/data/gen/ReduxItemModelGen.java b/src/main/java/net/zepalesque/redux/data/gen/ReduxItemModelGen.java index bfc5ae257..e31c0d335 100644 --- a/src/main/java/net/zepalesque/redux/data/gen/ReduxItemModelGen.java +++ b/src/main/java/net/zepalesque/redux/data/gen/ReduxItemModelGen.java @@ -31,7 +31,7 @@ protected void registerModels() { this.itemOverlayColumn(ReduxBlocks.LOCKED_CARVED_STONE_PILLAR.get(), ReduxBlocks.CARVED_STONE_PILLAR.get(), "dungeon/lock", "dungeon/"); this.itemOverlayColumn(ReduxBlocks.LOCKED_SENTRY_STONE_BASE.get(), ReduxBlocks.SENTRY_STONE_BASE.get(), "dungeon/lock", "dungeon/"); this.itemOverlayColumn(ReduxBlocks.LOCKED_SENTRY_STONE_PILLAR.get(), ReduxBlocks.SENTRY_STONE_PILLAR.get(), "dungeon/lock", "dungeon/"); - + this.itemOverlayColumn(ReduxBlocks.TRAPPED_CARVED_STONE_BASE.get(), ReduxBlocks.CARVED_STONE_BASE.get(), "dungeon/exclamation", "dungeon/"); this.itemOverlayColumn(ReduxBlocks.TRAPPED_CARVED_STONE_PILLAR.get(), ReduxBlocks.CARVED_STONE_PILLAR.get(), "dungeon/exclamation", "dungeon/"); this.itemOverlayColumn(ReduxBlocks.TRAPPED_SENTRY_STONE_BASE.get(), ReduxBlocks.SENTRY_STONE_BASE.get(), "dungeon/exclamation", "dungeon/"); diff --git a/src/main/java/net/zepalesque/redux/data/prov/ReduxItemModelProvider.java b/src/main/java/net/zepalesque/redux/data/prov/ReduxItemModelProvider.java index 1a06647fe..4ff5579b0 100644 --- a/src/main/java/net/zepalesque/redux/data/prov/ReduxItemModelProvider.java +++ b/src/main/java/net/zepalesque/redux/data/prov/ReduxItemModelProvider.java @@ -30,21 +30,6 @@ public ItemModelBuilder itemBlockFlatCustomTexture(Supplier blo .texture("layer0", texture(locationPlusName)); } - public void itemOverlayBlock(Block block, Block baseBlock, String overlay) { - this.withExistingParent(this.blockName(block), this.blockName(baseBlock)) - .texture("overlay", new ResourceLocation(Aether.MODID, "block/" + overlay)) - .element().from(0.0F, 0.0F, -0.1F).to(16.0F, 16.0F, -0.1F).rotation().angle(0.0F).axis(Direction.Axis.Y).origin(8.0F, 8.0F, 6.9F).end().face(Direction.NORTH).texture("#overlay").emissivity(15, 15).end().end() - .transforms() - .transform(ItemDisplayContext.THIRD_PERSON_RIGHT_HAND).rotation(75.0F, 45.0F, 0.0F).translation(0.0F, 2.5F, 0.0F).scale(0.375F, 0.375F, 0.375F).end() - .transform(ItemDisplayContext.THIRD_PERSON_LEFT_HAND).rotation(75.0F, 45.0F, 0.0F).translation(0.0F, 2.5F, 0.0F).scale(0.375F, 0.375F, 0.375F).end() - .transform(ItemDisplayContext.FIRST_PERSON_RIGHT_HAND).rotation(-90.0F, -180.0F, -45.0F).scale(0.4F, 0.4F, 0.4F).end() - .transform(ItemDisplayContext.FIRST_PERSON_LEFT_HAND).rotation(-90.0F, -180.0F, -45.0F).scale(0.4F, 0.4F, 0.4F).end() - .transform(ItemDisplayContext.GROUND).rotation(90.0F, 0.0F, 0.0F).translation(0.0F, 3.0F, 0.0F).scale(0.25F, 0.25F, 0.25F).end() - .transform(ItemDisplayContext.GUI).rotation(30.0F, 135.0F, 0.0F).scale(0.625F, 0.625F, 0.625F).end() - .transform(ItemDisplayContext.FIXED).scale(0.5F, 0.5F, 0.5F).end() - .end(); - } - public void itemOverlayColumn(Block block, Block baseBlock, String overlay, String location) { ResourceLocation side = ReduxBlockStateProvider.extendStatic(this.texture(ReduxBlockStateProvider.nameStatic(baseBlock), location), "_side"); ResourceLocation end = ReduxBlockStateProvider.extendStatic(this.texture(ReduxBlockStateProvider.nameStatic(baseBlock), location), "_top");