Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update textures #24

Merged
merged 1 commit into from
Jul 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.1 2023-07-18T21:39:02.4765753 Copperative Block States
// 1.20.1 2023-07-28T22:06:54.9598817 Copperative Block States
438a4135790e3deb954693124d4a4b7d7e461e92 assets/copperative/blockstates/copper_bricks.json
af2412f680c0e702248592f9616c1b481fa15c28 assets/copperative/blockstates/copper_door.json
5f8c06ec4a3a98236de6c9f3bdf85e8775a7d6b8 assets/copperative/blockstates/copper_pillar.json
Expand Down Expand Up @@ -214,7 +214,7 @@ a5d0a052c99b12574e8c3655cfd48bbdae2d299e assets/copperative/models/block/oxidize
88a8d55256723cbbd885e58e245c87aed302d484 assets/copperative/models/block/oxidized_sticky_piston_base.json
186aa943b8f259720ce5c6ba432fd6aabe3d91b1 assets/copperative/models/block/oxidized_toggler.json
6364781745b34482dd0ccd1027ad47f533b4bdc0 assets/copperative/models/block/oxidized_toggler_on.json
d4b01e331a7dd0f7ccdbe60bdcceb895d996c8e8 assets/copperative/models/block/patina_block.json
18a14ceaf50e7f215deb459bf07683a4c7e2e71e assets/copperative/models/block/patina_block.json
9c287a5344a48bb1b235792f24b82ff59e782b16 assets/copperative/models/block/toggler.json
600dad5534b87cf797200b82a08d5066c7d37413 assets/copperative/models/block/toggler_on.json
6a7c16c83f41f3c4679f2eee185004db87753082 assets/copperative/models/block/waxed_copper_bricks.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"parent": "minecraft:block/cube_all",
"parent": "minecraft:block/cube_column",
"textures": {
"all": "copperative:block/patina_block"
"end": "copperative:block/patina_block_top",
"side": "copperative:block/patina_block"
}
}
2 changes: 1 addition & 1 deletion src/main/java/galena/copperative/data/CBlockStates.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ private static String unwaxedName(Supplier<? extends Block> block) {

@Override
protected void registerStatesAndModels() {
block(CBlocks.PATINA_BLOCK);
staticColumn(CBlocks.PATINA_BLOCK);
weatheringBlock(CBlocks.COPPER_BRICKS);
weatheringPillarBlock(CBlocks.COPPER_PILLAR);
weatheringPillarBlock(CBlocks.COPPER_TILES);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -538,4 +538,10 @@ public void randomizer(Supplier<? extends Block> block) {
}, BlockStateProperties.POWER);
*/
}

public <B extends Block> void staticColumn(Supplier<B> block) {
var name = name(block);
var texture = texture(name);
simpleBlock(block.get(), models().cubeColumn(name, texture, new ResourceLocation(texture.getNamespace(), texture.getPath() + "_top")));
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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/copperative/textures/item/patina.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.