Skip to content

Commit

Permalink
Various texture tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
@Forstride
Forstride committed Nov 30, 2023
1 parent 0be0aed commit 21e0a5a
Show file tree
Hide file tree
Showing 18 changed files with 62 additions and 135 deletions.
6 changes: 3 additions & 3 deletions src/main/java/biomesoplenty/api/block/BOPBlocks.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,14 +138,14 @@ public class BOPBlocks
public static RegistryObject<Block> PINE_HANGING_SIGN;
public static RegistryObject<Block> PINE_WALL_HANGING_SIGN;
public static RegistryObject<Block> RED_MAPLE_SAPLING;
public static RegistryObject<Block> RED_MAPLE_LEAVES;
public static RegistryObject<Block> RED_MAPLE_LEAF_PILE;
public static RegistryObject<Block> RED_MAPLE_LEAVES;
public static RegistryObject<Block> ORANGE_MAPLE_SAPLING;
public static RegistryObject<Block> ORANGE_MAPLE_LEAVES;
public static RegistryObject<Block> ORANGE_MAPLE_LEAF_PILE;
public static RegistryObject<Block> ORANGE_MAPLE_LEAVES;
public static RegistryObject<Block> YELLOW_MAPLE_SAPLING;
public static RegistryObject<Block> YELLOW_MAPLE_LEAVES;
public static RegistryObject<Block> YELLOW_MAPLE_LEAF_PILE;
public static RegistryObject<Block> YELLOW_MAPLE_LEAVES;
public static RegistryObject<Block> MAPLE_LOG;
public static RegistryObject<Block> STRIPPED_MAPLE_LOG;
public static RegistryObject<Block> MAPLE_WOOD;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/biomesoplenty/init/ModBlocks.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,14 +198,14 @@ public static void registerBlocks()
PINE_WALL_HANGING_SIGN = registerBlockNoBlockItem(() -> new WallHangingSignBlockBOP(BlockBehaviour.Properties.of().mapColor(PINE_PLANKS.get().defaultMapColor()).instrument(NoteBlockInstrument.BASS).ignitedByLava().forceSolidOn().noCollission().strength(1.0F).sound(SoundType.WOOD).lootFrom(PINE_HANGING_SIGN), BOPWoodTypes.PINE), "pine_wall_hanging_sign");

RED_MAPLE_SAPLING = registerBlock(() -> new SaplingBlockBOP(new RedMapleTree(), BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_RED).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().instabreak().sound(SoundType.GRASS)), "red_maple_sapling");
RED_MAPLE_LEAVES = registerBlock(() -> new RedMapleLeavesBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).mapColor(MapColor.COLOR_RED).strength(0.2F).randomTicks().sound(SoundType.GRASS).noOcclusion().isValidSpawn(ModBlocks::ocelotOrParrot).isSuffocating(ModBlocks::never).isViewBlocking(ModBlocks::never).ignitedByLava().isRedstoneConductor(ModBlocks::never)), "red_maple_leaves");
RED_MAPLE_LEAF_PILE = registerBlock(() -> new LeafPileBlock(BlockBehaviour.Properties.of().noOcclusion().pushReaction(PushReaction.DESTROY).mapColor(MapColor.COLOR_RED).replaceable().noCollission().instabreak().sound(SoundType.GRASS)), "red_maple_leaf_pile");
RED_MAPLE_LEAVES = registerBlock(() -> new RedMapleLeavesBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).mapColor(MapColor.COLOR_RED).strength(0.2F).randomTicks().sound(SoundType.GRASS).noOcclusion().isValidSpawn(ModBlocks::ocelotOrParrot).isSuffocating(ModBlocks::never).isViewBlocking(ModBlocks::never).ignitedByLava().isRedstoneConductor(ModBlocks::never)), "red_maple_leaves");
ORANGE_MAPLE_SAPLING = registerBlock(() -> new SaplingBlockBOP(new OrangeMapleTree(), BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_ORANGE).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().instabreak().sound(SoundType.GRASS)), "orange_maple_sapling");
ORANGE_MAPLE_LEAVES = registerBlock(() -> new OrangeMapleLeavesBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).mapColor(MapColor.TERRACOTTA_ORANGE).strength(0.2F).randomTicks().sound(SoundType.GRASS).noOcclusion().isValidSpawn(ModBlocks::ocelotOrParrot).isSuffocating(ModBlocks::never).isViewBlocking(ModBlocks::never).ignitedByLava().isRedstoneConductor(ModBlocks::never)), "orange_maple_leaves");
ORANGE_MAPLE_LEAF_PILE = registerBlock(() -> new LeafPileBlock(BlockBehaviour.Properties.of().noOcclusion().pushReaction(PushReaction.DESTROY).mapColor(MapColor.TERRACOTTA_ORANGE).replaceable().noCollission().instabreak().sound(SoundType.GRASS)), "orange_maple_leaf_pile");
ORANGE_MAPLE_LEAVES = registerBlock(() -> new OrangeMapleLeavesBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).mapColor(MapColor.TERRACOTTA_ORANGE).strength(0.2F).randomTicks().sound(SoundType.GRASS).noOcclusion().isValidSpawn(ModBlocks::ocelotOrParrot).isSuffocating(ModBlocks::never).isViewBlocking(ModBlocks::never).ignitedByLava().isRedstoneConductor(ModBlocks::never)), "orange_maple_leaves");
YELLOW_MAPLE_SAPLING = registerBlock(() -> new SaplingBlockBOP(new YellowMapleTree(), BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_YELLOW).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().instabreak().sound(SoundType.GRASS)), "yellow_maple_sapling");
YELLOW_MAPLE_LEAVES = registerBlock(() -> new YellowMapleLeavesBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).mapColor(MapColor.TERRACOTTA_YELLOW).strength(0.2F).randomTicks().sound(SoundType.GRASS).noOcclusion().isValidSpawn(ModBlocks::ocelotOrParrot).isSuffocating(ModBlocks::never).isViewBlocking(ModBlocks::never).ignitedByLava().isRedstoneConductor(ModBlocks::never)), "yellow_maple_leaves");
YELLOW_MAPLE_LEAF_PILE = registerBlock(() -> new LeafPileBlock(BlockBehaviour.Properties.of().noOcclusion().pushReaction(PushReaction.DESTROY).mapColor(MapColor.TERRACOTTA_YELLOW).replaceable().noCollission().instabreak().sound(SoundType.GRASS)), "yellow_maple_leaf_pile");
YELLOW_MAPLE_LEAVES = registerBlock(() -> new YellowMapleLeavesBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).mapColor(MapColor.TERRACOTTA_YELLOW).strength(0.2F).randomTicks().sound(SoundType.GRASS).noOcclusion().isValidSpawn(ModBlocks::ocelotOrParrot).isSuffocating(ModBlocks::never).isViewBlocking(ModBlocks::never).ignitedByLava().isRedstoneConductor(ModBlocks::never)), "yellow_maple_leaves");
MAPLE_LOG = registerBlock(() -> log(MapColor.DIRT, MapColor.TERRACOTTA_BROWN), "maple_log");
MAPLE_WOOD = registerBlock(() -> new RotatedPillarBlock(BlockBehaviour.Properties.of().instrument(NoteBlockInstrument.BASS).ignitedByLava().mapColor(MapColor.DIRT).strength(2.0F).sound(SoundType.WOOD)), "maple_wood");
STRIPPED_MAPLE_LOG = registerBlock(() -> log(MapColor.DIRT, MapColor.DIRT), "stripped_maple_log");
Expand Down
44 changes: 44 additions & 0 deletions src/main/resources/assets/biomesoplenty/models/block/leaf_pile.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"ambientocclusion": false,
"textures": {
"particle": "#leaves"
},
"elements": [
{
"from": [0, 0, 4],
"to": [16, 0, 20],
"rotation": {"angle": 22.5, "axis": "x", "origin": [8, 0, 16], "rescale": true},
"faces": {
"up": {"uv": [0, 0, 16, 16], "texture": "#leaves"},
"down": {"uv": [0, 0, 16, 16], "texture": "#leaves"}
}
},
{
"from": [-4, 0, 0],
"to": [12, 0, 16],
"rotation": {"angle": 22.5, "axis": "z", "origin": [0, 0, 8], "rescale": true},
"faces": {
"up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#leaves"},
"down": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#leaves"}
}
},
{
"from": [0, 0, -4],
"to": [16, 0, 12],
"rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0, 0], "rescale": true},
"faces": {
"up": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#leaves"},
"down": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#leaves"}
}
},
{
"from": [4, 0, 0],
"to": [20, 0, 16],
"rotation": {"angle": -22.5, "axis": "z", "origin": [16, 0, 8], "rescale": true},
"faces": {
"up": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#leaves"},
"down": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#leaves"}
}
}
]
}
45 changes: 3 additions & 42 deletions src/main/resources/assets/biomesoplenty/models/block/orange_maple_leaf_pile.json
View file
Original file line number Diff line number Diff line change
@@ -1,45 +1,6 @@
{
"ambientocclusion": false,
"parent": "biomesoplenty:block/leaf_pile",
"textures": {
"leaves": "biomesoplenty:block/orange_maple_leaf_pile",
"particle": "biomesoplenty:block/orange_maple_leaf_pile"
},
"elements": [
{
"from": [0, 0, 4],
"to": [16, 0, 20],
"rotation": {"angle": 22.5, "axis": "x", "origin": [8, 0, 16], "rescale": true},
"faces": {
"up": {"uv": [0, 0, 16, 16], "texture": "#leaves"},
"down": {"uv": [0, 0, 16, 16], "texture": "#leaves"}
}
},
{
"from": [-4, 0, 0],
"to": [12, 0, 16],
"rotation": {"angle": 22.5, "axis": "z", "origin": [0, 0, 8], "rescale": true},
"faces": {
"up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#leaves"},
"down": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#leaves"}
}
},
{
"from": [0, 0, -4],
"to": [16, 0, 12],
"rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0, 0], "rescale": true},
"faces": {
"up": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#leaves"},
"down": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#leaves"}
}
},
{
"from": [4, 0, 0],
"to": [20, 0, 16],
"rotation": {"angle": -22.5, "axis": "z", "origin": [16, 0, 8], "rescale": true},
"faces": {
"up": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#leaves"},
"down": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#leaves"}
}
}
]
"leaves": "biomesoplenty:block/orange_maple_leaf_pile"
}
}
45 changes: 3 additions & 42 deletions src/main/resources/assets/biomesoplenty/models/block/red_maple_leaf_pile.json
View file
Original file line number Diff line number Diff line change
@@ -1,45 +1,6 @@
{
"ambientocclusion": false,
"parent": "biomesoplenty:block/leaf_pile",
"textures": {
"leaves": "biomesoplenty:block/red_maple_leaf_pile",
"particle": "biomesoplenty:block/red_maple_leaf_pile"
},
"elements": [
{
"from": [0, 0, 4],
"to": [16, 0, 20],
"rotation": {"angle": 22.5, "axis": "x", "origin": [8, 0, 16], "rescale": true},
"faces": {
"up": {"uv": [0, 0, 16, 16], "texture": "#leaves"},
"down": {"uv": [0, 0, 16, 16], "texture": "#leaves"}
}
},
{
"from": [-4, 0, 0],
"to": [12, 0, 16],
"rotation": {"angle": 22.5, "axis": "z", "origin": [0, 0, 8], "rescale": true},
"faces": {
"up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#leaves"},
"down": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#leaves"}
}
},
{
"from": [0, 0, -4],
"to": [16, 0, 12],
"rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0, 0], "rescale": true},
"faces": {
"up": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#leaves"},
"down": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#leaves"}
}
},
{
"from": [4, 0, 0],
"to": [20, 0, 16],
"rotation": {"angle": -22.5, "axis": "z", "origin": [16, 0, 8], "rescale": true},
"faces": {
"up": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#leaves"},
"down": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#leaves"}
}
}
]
"leaves": "biomesoplenty:block/red_maple_leaf_pile"
}
}
45 changes: 3 additions & 42 deletions src/main/resources/assets/biomesoplenty/models/block/yellow_maple_leaf_pile.json
View file
Original file line number Diff line number Diff line change
@@ -1,45 +1,6 @@
{
"ambientocclusion": false,
"parent": "biomesoplenty:block/leaf_pile",
"textures": {
"leaves": "biomesoplenty:block/yellow_maple_leaf_pile",
"particle": "biomesoplenty:block/yellow_maple_leaf_pile"
},
"elements": [
{
"from": [0, 0, 4],
"to": [16, 0, 20],
"rotation": {"angle": 22.5, "axis": "x", "origin": [8, 0, 16], "rescale": true},
"faces": {
"up": {"uv": [0, 0, 16, 16], "texture": "#leaves"},
"down": {"uv": [0, 0, 16, 16], "texture": "#leaves"}
}
},
{
"from": [-4, 0, 0],
"to": [12, 0, 16],
"rotation": {"angle": 22.5, "axis": "z", "origin": [0, 0, 8], "rescale": true},
"faces": {
"up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#leaves"},
"down": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#leaves"}
}
},
{
"from": [0, 0, -4],
"to": [16, 0, 12],
"rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0, 0], "rescale": true},
"faces": {
"up": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#leaves"},
"down": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#leaves"}
}
},
{
"from": [4, 0, 0],
"to": [20, 0, 16],
"rotation": {"angle": -22.5, "axis": "z", "origin": [16, 0, 8], "rescale": true},
"faces": {
"up": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#leaves"},
"down": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#leaves"}
}
}
]
"leaves": "biomesoplenty:block/yellow_maple_leaf_pile"
}
}
2 changes: 1 addition & 1 deletion src/main/resources/assets/biomesoplenty/models/item/orange_maple_leaf_pile.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "biomesoplenty:block/orange_maple_leaf_pile"
"layer0": "biomesoplenty:item/orange_maple_leaf_pile"
}
}
2 changes: 1 addition & 1 deletion src/main/resources/assets/biomesoplenty/models/item/red_maple_leaf_pile.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "biomesoplenty:block/red_maple_leaf_pile"
"layer0": "biomesoplenty:item/red_maple_leaf_pile"
}
}
2 changes: 1 addition & 1 deletion src/main/resources/assets/biomesoplenty/models/item/yellow_maple_leaf_pile.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "biomesoplenty:block/yellow_maple_leaf_pile"
"layer0": "biomesoplenty:item/yellow_maple_leaf_pile"
}
}
Binary file modified src/main/resources/assets/biomesoplenty/textures/block/burning_blossom.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/main/resources/assets/biomesoplenty/textures/block/orange_cosmos.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/main/resources/assets/biomesoplenty/textures/block/orange_maple_sapling.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/main/resources/assets/biomesoplenty/textures/block/red_maple_sapling.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/main/resources/assets/biomesoplenty/textures/block/yellow_maple_sapling.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/assets/biomesoplenty/textures/item/orange_maple_leaf_pile.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/assets/biomesoplenty/textures/item/red_maple_leaf_pile.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/main/resources/assets/biomesoplenty/textures/item/waterlily.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/assets/biomesoplenty/textures/item/yellow_maple_leaf_pile.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 21e0a5a

Please sign in to comment.