Skip to content

Commit

Permalink
染色玻璃合成
Browse files Browse the repository at this point in the history
  • Loading branch information
MagicHarp committed Oct 8, 2024
1 parent 382cbe9 commit ba29ec2
Show file tree
Hide file tree
Showing 21 changed files with 330 additions and 10 deletions.
4 changes: 2 additions & 2 deletions src/main/java/org/confluence/mod/block/common/DecorativeBlocks.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ public final class DecorativeBlocks {

public static final RegistryObject<Block> PURE_GLASS = registerWithItem("pure_glass", () -> new ConnectedGlassBlock(BlockBehaviour.Properties.copy(Blocks.GLASS)));
public static final RegistryObject<Block> WHITE_PURE_GLASS = registerWithItem("white_pure_glass", () -> new ConnectedGlassBlock(BlockBehaviour.Properties.copy(Blocks.GLASS)));
public static final RegistryObject<Block> LIGHT_GREY_PURE_GLASS = registerWithItem("light_grey_pure_glass", () -> new ConnectedGlassBlock(BlockBehaviour.Properties.copy(Blocks.GLASS)));
public static final RegistryObject<Block> GREY_PURE_GLASS = registerWithItem("grey_pure_glass", () -> new ConnectedGlassBlock(BlockBehaviour.Properties.copy(Blocks.GLASS)));
public static final RegistryObject<Block> LIGHT_GRAY_PURE_GLASS = registerWithItem("light_gray_pure_glass", () -> new ConnectedGlassBlock(BlockBehaviour.Properties.copy(Blocks.GLASS)));
public static final RegistryObject<Block> GRAY_PURE_GLASS = registerWithItem("gray_pure_glass", () -> new ConnectedGlassBlock(BlockBehaviour.Properties.copy(Blocks.GLASS)));
public static final RegistryObject<Block> BLACK_PURE_GLASS = registerWithItem("black_pure_glass", () -> new ConnectedGlassBlock(BlockBehaviour.Properties.copy(Blocks.GLASS)));
public static final RegistryObject<Block> BROWN_PURE_GLASS = registerWithItem("brown_pure_glass", () -> new ConnectedGlassBlock(BlockBehaviour.Properties.copy(Blocks.GLASS)));
public static final RegistryObject<Block> RED_PURE_GLASS = registerWithItem("red_pure_glass", () -> new ConnectedGlassBlock(BlockBehaviour.Properties.copy(Blocks.GLASS)));
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/confluence/mod/client/connected/AllSpriteShifts.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ public class AllSpriteShifts {
public static final CTSpriteShiftEntry SUN_PLATE = omni("sun_plate");
public static final CTSpriteShiftEntry PURE_GLASS = omni("pure_glass");
public static final CTSpriteShiftEntry WHITE_PURE_GLASS = omni("white_pure_glass");
public static final CTSpriteShiftEntry LIGHT_GREY_PURE_GLASS = omni("light_grey_pure_glass");
public static final CTSpriteShiftEntry GREY_PURE_GLASS = omni("grey_pure_glass");
public static final CTSpriteShiftEntry LIGHT_GRAY_PURE_GLASS = omni("light_grey_pure_glass");
public static final CTSpriteShiftEntry GRAY_PURE_GLASS = omni("grey_pure_glass");
public static final CTSpriteShiftEntry BLACK_PURE_GLASS = omni("black_pure_glass");
public static final CTSpriteShiftEntry BROWN_PURE_GLASS = omni("brown_pure_glass");
public static final CTSpriteShiftEntry RED_PURE_GLASS = omni("red_pure_glass");
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/org/confluence/mod/client/connected/ModConnectives.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ public static void register(IEventBus modEventBus) {
registerCasingConnectivity(DecorativeBlocks.PURE_GLASS.get(), (block, cc) -> cc.makeCasing(block, AllSpriteShifts.PURE_GLASS));
registerCTBehaviour(DecorativeBlocks.WHITE_PURE_GLASS.get(), () -> new EncasedCTBehaviour(AllSpriteShifts.WHITE_PURE_GLASS));
registerCasingConnectivity(DecorativeBlocks.WHITE_PURE_GLASS.get(), (block, cc) -> cc.makeCasing(block, AllSpriteShifts.WHITE_PURE_GLASS));
registerCTBehaviour(DecorativeBlocks.LIGHT_GREY_PURE_GLASS.get(), () -> new EncasedCTBehaviour(AllSpriteShifts.LIGHT_GREY_PURE_GLASS));
registerCasingConnectivity(DecorativeBlocks.LIGHT_GREY_PURE_GLASS.get(), (block, cc) -> cc.makeCasing(block, AllSpriteShifts.LIGHT_GREY_PURE_GLASS));
registerCTBehaviour(DecorativeBlocks.GREY_PURE_GLASS.get(), () -> new EncasedCTBehaviour(AllSpriteShifts.GREY_PURE_GLASS));
registerCasingConnectivity(DecorativeBlocks.GREY_PURE_GLASS.get(), (block, cc) -> cc.makeCasing(block, AllSpriteShifts.GREY_PURE_GLASS));
registerCTBehaviour(DecorativeBlocks.LIGHT_GRAY_PURE_GLASS.get(), () -> new EncasedCTBehaviour(AllSpriteShifts.LIGHT_GRAY_PURE_GLASS));
registerCasingConnectivity(DecorativeBlocks.LIGHT_GRAY_PURE_GLASS.get(), (block, cc) -> cc.makeCasing(block, AllSpriteShifts.LIGHT_GRAY_PURE_GLASS));
registerCTBehaviour(DecorativeBlocks.GRAY_PURE_GLASS.get(), () -> new EncasedCTBehaviour(AllSpriteShifts.GRAY_PURE_GLASS));
registerCasingConnectivity(DecorativeBlocks.GRAY_PURE_GLASS.get(), (block, cc) -> cc.makeCasing(block, AllSpriteShifts.GRAY_PURE_GLASS));
registerCTBehaviour(DecorativeBlocks.BLACK_PURE_GLASS.get(), () -> new EncasedCTBehaviour(AllSpriteShifts.BLACK_PURE_GLASS));
registerCasingConnectivity(DecorativeBlocks.BLACK_PURE_GLASS.get(), (block, cc) -> cc.makeCasing(block, AllSpriteShifts.BLACK_PURE_GLASS));
registerCTBehaviour(DecorativeBlocks.BROWN_PURE_GLASS.get(), () -> new EncasedCTBehaviour(AllSpriteShifts.BROWN_PURE_GLASS));
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/confluence/mod/datagen/ModChineseProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -928,8 +928,8 @@ protected void addTranslations() {
add(MARBLE_COLUMN.get(), "异域大理岩梁");
add(PURE_GLASS.get(), "纯净玻璃块");
add(WHITE_PURE_GLASS.get(), "白色纯净玻璃块");
add(LIGHT_GREY_PURE_GLASS.get(), "淡灰色玻璃块");
add(GREY_PURE_GLASS.get(), "灰色纯净玻璃块");
add(LIGHT_GRAY_PURE_GLASS.get(), "淡灰色玻璃块");
add(GRAY_PURE_GLASS.get(), "灰色纯净玻璃块");
add(BLACK_PURE_GLASS.get(), "黑色纯净玻璃块");
add(BROWN_PURE_GLASS.get(), "棕色纯净玻璃块");
add(RED_PURE_GLASS.get(), "红色纯净玻璃块");
Expand Down
Binary file modified src/main/resources/assets/confluence/textures/achievement/benched.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.
20 changes: 20 additions & 0 deletions src/main/resources/data/confluence/recipes/black_pure_glass.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"###",
"#W#",
"###"
],
"key": {
"#": {
"item": "confluence:pure_glass"
},
"W": {
"item": "minecraft:black_dye"
}
},
"result": {
"item": "confluence:black_pure_glass",
"count": 8
}
}
20 changes: 20 additions & 0 deletions src/main/resources/data/confluence/recipes/blue_pure_glass.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"###",
"#W#",
"###"
],
"key": {
"#": {
"item": "confluence:pure_glass"
},
"W": {
"item": "minecraft:blue_dye"
}
},
"result": {
"item": "confluence:blue_pure_glass",
"count": 8
}
}
20 changes: 20 additions & 0 deletions src/main/resources/data/confluence/recipes/brown_pure_glass.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"###",
"#W#",
"###"
],
"key": {
"#": {
"item": "confluence:pure_glass"
},
"W": {
"item": "minecraft:brown_dye"
}
},
"result": {
"item": "confluence:brown_pure_glass",
"count": 8
}
}
20 changes: 20 additions & 0 deletions src/main/resources/data/confluence/recipes/cyan_pure_glass.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"###",
"#W#",
"###"
],
"key": {
"#": {
"item": "confluence:pure_glass"
},
"W": {
"item": "minecraft:cyan_dye"
}
},
"result": {
"item": "confluence:cyan_pure_glass",
"count": 8
}
}
20 changes: 20 additions & 0 deletions src/main/resources/data/confluence/recipes/gray_pure_glass.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"###",
"#W#",
"###"
],
"key": {
"#": {
"item": "confluence:pure_glass"
},
"W": {
"item": "minecraft:gray_dye"
}
},
"result": {
"item": "confluence:gray_pure_glass",
"count": 8
}
}
20 changes: 20 additions & 0 deletions src/main/resources/data/confluence/recipes/green_pure_glass.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"###",
"#W#",
"###"
],
"key": {
"#": {
"item": "confluence:pure_glass"
},
"W": {
"item": "minecraft:green_dye"
}
},
"result": {
"item": "confluence:green_pure_glass",
"count": 8
}
}
20 changes: 20 additions & 0 deletions src/main/resources/data/confluence/recipes/light_blue_pure_glass.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"###",
"#W#",
"###"
],
"key": {
"#": {
"item": "confluence:pure_glass"
},
"W": {
"item": "minecraft:light_blue_dye"
}
},
"result": {
"item": "confluence:light_blue_pure_glass",
"count": 8
}
}
20 changes: 20 additions & 0 deletions src/main/resources/data/confluence/recipes/light_gray_pure_glass.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"###",
"#W#",
"###"
],
"key": {
"#": {
"item": "confluence:pure_glass"
},
"W": {
"item": "minecraft:light_gray_dye"
}
},
"result": {
"item": "confluence:light_gray_pure_glass",
"count": 8
}
}
20 changes: 20 additions & 0 deletions src/main/resources/data/confluence/recipes/lime_pure_glass.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"###",
"#W#",
"###"
],
"key": {
"#": {
"item": "confluence:pure_glass"
},
"W": {
"item": "minecraft:lime_dye"
}
},
"result": {
"item": "confluence:lime_pure_glass",
"count": 8
}
}
20 changes: 20 additions & 0 deletions src/main/resources/data/confluence/recipes/magenta_pure_glass.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"###",
"#W#",
"###"
],
"key": {
"#": {
"item": "confluence:pure_glass"
},
"W": {
"item": "minecraft:magenta_dye"
}
},
"result": {
"item": "confluence:magenta_pure_glass",
"count": 8
}
}
20 changes: 20 additions & 0 deletions src/main/resources/data/confluence/recipes/orange_pure_glass.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"###",
"#W#",
"###"
],
"key": {
"#": {
"item": "confluence:pure_glass"
},
"W": {
"item": "minecraft:orange_dye"
}
},
"result": {
"item": "confluence:orange_pure_glass",
"count": 8
}
}
20 changes: 20 additions & 0 deletions src/main/resources/data/confluence/recipes/pink_pure_glass.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"###",
"#W#",
"###"
],
"key": {
"#": {
"item": "confluence:pure_glass"
},
"W": {
"item": "minecraft:pink_dye"
}
},
"result": {
"item": "confluence:pink_pure_glass",
"count": 8
}
}
20 changes: 20 additions & 0 deletions src/main/resources/data/confluence/recipes/purple_pure_glass.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"###",
"#W#",
"###"
],
"key": {
"#": {
"item": "confluence:pure_glass"
},
"W": {
"item": "minecraft:purple_dye"
}
},
"result": {
"item": "confluence:purple_pure_glass",
"count": 8
}
}
20 changes: 20 additions & 0 deletions src/main/resources/data/confluence/recipes/red_pure_glass.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"###",
"#W#",
"###"
],
"key": {
"#": {
"item": "confluence:pure_glass"
},
"W": {
"item": "minecraft:red_dye"
}
},
"result": {
"item": "confluence:red_pure_glass",
"count": 8
}
}
20 changes: 20 additions & 0 deletions src/main/resources/data/confluence/recipes/white_pure_glass.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"###",
"#W#",
"###"
],
"key": {
"#": {
"item": "confluence:pure_glass"
},
"W": {
"item": "minecraft:white_dye"
}
},
"result": {
"item": "confluence:white_pure_glass",
"count": 8
}
}
20 changes: 20 additions & 0 deletions src/main/resources/data/confluence/recipes/yellow_pure_glass.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"###",
"#W#",
"###"
],
"key": {
"#": {
"item": "confluence:pure_glass"
},
"W": {
"item": "minecraft:yellow_dye"
}
},
"result": {
"item": "confluence:yellow_pure_glass",
"count": 8
}
}

0 comments on commit ba29ec2

Please sign in to comment.