Skip to content

Commit 18c78b0

Browse files
cassiancccassiancc
committed
Backport 0.15.4
1 parent 9b54d0c commit 18c78b0

File tree

200 files changed

+570
-295
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

200 files changed

+570
-295
lines changed

‎common/src/main/java/cc/cassian/pyrite/Pyrite.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,9 @@ public static void init() {
124124
// Dyed Lamps
125125
createPyriteBlock(dye + "_lamp","block", 0.3f, color, 15);
126126
// Dyed Framed Glass
127-
createPyriteBlock(dye+"_framed_glass","tinted_glass", 2.0f, color, blockLux);
127+
createPyriteBlock(dye+"_framed_glass","stained_framed_glass", 2.0f, color, blockLux);
128128
// Dyed Framed Glass Pane
129-
createPyriteBlock( dye+"_framed_glass_pane","tinted_glass_pane", 2.0f, color, blockLux);
129+
createPyriteBlock( dye+"_framed_glass_pane","stained_framed_glass_pane", 2.0f, color, blockLux);
130130
// Dyed Torch Levers
131131
createTorchLever(dye+"_torch_lever", Blocks.TORCH, getTorchParticle(dye));
132132

‎common/src/main/java/cc/cassian/pyrite/blocks/StainedFramedGlass.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package cc.cassian.pyrite.blocks;
2+
3+
import cc.cassian.pyrite.functions.ModHelpers;
4+
import net.minecraft.block.StainedGlassBlock;
5+
import net.minecraft.util.DyeColor;
6+
7+
public class StainedFramedGlass extends StainedGlassBlock {
8+
public StainedFramedGlass(DyeColor color, Settings settings) {
9+
super (color, settings.nonOpaque());
10+
}
11+
}

‎common/src/main/java/cc/cassian/pyrite/functions/BlockCreator.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
import net.minecraft.block.*;
55
import net.minecraft.block.piston.PistonBehavior;
66
import net.minecraft.particle.ParticleEffect;
7+
import net.minecraft.sound.BlockSoundGroup;
8+
79
import java.util.Map;
810
import java.util.Objects;
911

@@ -72,7 +74,7 @@ public static void createPyriteBlock(String blockID, String blockType, Float str
7274
sendToRegistry(blockID, "block", settings.strength(strength, 1200f).pistonBehavior(PistonBehavior.BLOCK));
7375
}
7476
else {
75-
sendToRegistry(blockID, blockType, settings);
77+
sendToRegistry(blockID, blockType, settings.sounds(BlockSoundGroup.GLASS));
7678
}
7779
}
7880

‎common/src/main/java/cc/cassian/pyrite/functions/ModHelpers.java‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,20 @@ public static boolean isPoisonousSnapshot() {
7373
return (SharedConstants.getGameVersion().getName().contains("potato"));
7474
}
7575

76-
76+
public static DyeColor getDyeColorFromFramedId(String blockID) {
77+
var dye = blockID.split("_framed")[0];
78+
System.out.println(dye);
79+
return switch (dye) {
80+
case "glow" -> DyeColor.CYAN;
81+
case "dragon" -> DyeColor.BLACK;
82+
case "star" -> DyeColor.LIGHT_BLUE;
83+
case "honey" -> DyeColor.YELLOW;
84+
case "nostalgia" -> DyeColor.BROWN;
85+
case "rose" -> DyeColor.PINK;
86+
case "poisonous" -> DyeColor.LIME;
87+
default -> DyeColor.byName(dye, DyeColor.WHITE);
88+
};
89+
}
7790

7891
public static @NotNull BlockSetType getBlockSetType(String blockID) {
7992
boolean openByHand = !Objects.equals(blockID, "emerald") && (!Objects.equals(blockID, "netherite") && (!Objects.equals(blockID, "diamond")));

‎common/src/main/resources/assets/pyrite/blockstates/azalea_button.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"variants":{"face=ceiling,facing=east,powered=false":{"model":"pyrite:block/azalea_button","x":180,"y":270},"face=ceiling,facing=east,powered=true":{"model":"pyrite:block/azalea_button_pressed","x":180,"y":270},"face=ceiling,facing=north,powered=false":{"model":"pyrite:block/azalea_button","x":180,"y":180},"face=ceiling,facing=north,powered=true":{"model":"pyrite:block/azalea_button_pressed","x":180,"y":180},"face=ceiling,facing=south,powered=false":{"model":"pyrite:block/azalea_button","x":180},"face=ceiling,facing=south,powered=true":{"model":"pyrite:block/azalea_button_pressed","x":180},"face=ceiling,facing=west,powered=false":{"model":"pyrite:block/azalea_button","x":180,"y":90},"face=ceiling,facing=west,powered=true":{"model":"pyrite:block/azalea_button_pressed","x":180,"y":90},"face=floor,facing=east,powered=false":{"model":"pyrite:block/azalea_button","y":90},"face=floor,facing=east,powered=true":{"model":"pyrite:block/azalea_button_pressed","y":90},"face=floor,facing=north,powered=false":{"model":"pyrite:block/azalea_button"},"face=floor,facing=north,powered=true":{"model":"pyrite:block/azalea_button_pressed"},"face=floor,facing=south,powered=false":{"model":"pyrite:block/azalea_button","y":180},"face=floor,facing=south,powered=true":{"model":"pyrite:block/azalea_button_pressed","y":180},"face=floor,facing=west,powered=false":{"model":"pyrite:block/azalea_button","y":270},"face=floor,facing=west,powered=true":{"model":"pyrite:block/azalea_button_pressed","y":270},"face=wall,facing=east,powered=false":{"model":"pyrite:block/azalea_button","uvlock":true,"x":90,"y":90},"face=wall,facing=east,powered=true":{"model":"pyrite:block/azalea_button_pressed","uvlock":true,"x":90,"y":90},"face=wall,facing=north,powered=false":{"model":"pyrite:block/azalea_button","uvlock":true,"x":90},"face=wall,facing=north,powered=true":{"model":"pyrite:block/azalea_button_pressed","uvlock":true,"x":90},"face=wall,facing=south,powered=false":{"model":"pyrite:block/azalea_button","uvlock":true,"x":90,"y":180},"face=wall,facing=south,powered=true":{"model":"pyrite:block/azalea_button_pressed","uvlock":true,"x":90,"y":180},"face=wall,facing=west,powered=false":{"model":"pyrite:block/azalea_button","uvlock":true,"x":90,"y":270},"face=wall,facing=west,powered=true":{"model":"pyrite:block/azalea_button_pressed","uvlock":true,"x":90,"y":270}}}

‎common/src/main/resources/assets/pyrite/blockstates/azalea_crafting_table.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"variants":{"":{"model":"pyrite:block/azalea_crafting_table"}}}

‎common/src/main/resources/assets/pyrite/blockstates/azalea_door.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"variants":{"facing=east,half=lower,hinge=left,open=false":{"model":"pyrite:block/azalea_door_bottom_left"},"facing=east,half=lower,hinge=left,open=true":{"model":"pyrite:block/azalea_door_bottom_left_open","y":90},"facing=east,half=lower,hinge=right,open=false":{"model":"pyrite:block/azalea_door_bottom_right"},"facing=east,half=lower,hinge=right,open=true":{"model":"pyrite:block/azalea_door_bottom_right_open","y":270},"facing=east,half=upper,hinge=left,open=false":{"model":"pyrite:block/azalea_door_top_left"},"facing=east,half=upper,hinge=left,open=true":{"model":"pyrite:block/azalea_door_top_left_open","y":90},"facing=east,half=upper,hinge=right,open=false":{"model":"pyrite:block/azalea_door_top_right"},"facing=east,half=upper,hinge=right,open=true":{"model":"pyrite:block/azalea_door_top_right_open","y":270},"facing=north,half=lower,hinge=left,open=false":{"model":"pyrite:block/azalea_door_bottom_left","y":270},"facing=north,half=lower,hinge=left,open=true":{"model":"pyrite:block/azalea_door_bottom_left_open"},"facing=north,half=lower,hinge=right,open=false":{"model":"pyrite:block/azalea_door_bottom_right","y":270},"facing=north,half=lower,hinge=right,open=true":{"model":"pyrite:block/azalea_door_bottom_right_open","y":180},"facing=north,half=upper,hinge=left,open=false":{"model":"pyrite:block/azalea_door_top_left","y":270},"facing=north,half=upper,hinge=left,open=true":{"model":"pyrite:block/azalea_door_top_left_open"},"facing=north,half=upper,hinge=right,open=false":{"model":"pyrite:block/azalea_door_top_right","y":270},"facing=north,half=upper,hinge=right,open=true":{"model":"pyrite:block/azalea_door_top_right_open","y":180},"facing=south,half=lower,hinge=left,open=false":{"model":"pyrite:block/azalea_door_bottom_left","y":90},"facing=south,half=lower,hinge=left,open=true":{"model":"pyrite:block/azalea_door_bottom_left_open","y":180},"facing=south,half=lower,hinge=right,open=false":{"model":"pyrite:block/azalea_door_bottom_right","y":90},"facing=south,half=lower,hinge=right,open=true":{"model":"pyrite:block/azalea_door_bottom_right_open"},"facing=south,half=upper,hinge=left,open=false":{"model":"pyrite:block/azalea_door_top_left","y":90},"facing=south,half=upper,hinge=left,open=true":{"model":"pyrite:block/azalea_door_top_left_open","y":180},"facing=south,half=upper,hinge=right,open=false":{"model":"pyrite:block/azalea_door_top_right","y":90},"facing=south,half=upper,hinge=right,open=true":{"model":"pyrite:block/azalea_door_top_right_open"},"facing=west,half=lower,hinge=left,open=false":{"model":"pyrite:block/azalea_door_bottom_left","y":180},"facing=west,half=lower,hinge=left,open=true":{"model":"pyrite:block/azalea_door_bottom_left_open","y":270},"facing=west,half=lower,hinge=right,open=false":{"model":"pyrite:block/azalea_door_bottom_right","y":180},"facing=west,half=lower,hinge=right,open=true":{"model":"pyrite:block/azalea_door_bottom_right_open","y":90},"facing=west,half=upper,hinge=left,open=false":{"model":"pyrite:block/azalea_door_top_left","y":180},"facing=west,half=upper,hinge=left,open=true":{"model":"pyrite:block/azalea_door_top_left_open","y":270},"facing=west,half=upper,hinge=right,open=false":{"model":"pyrite:block/azalea_door_top_right","y":180},"facing=west,half=upper,hinge=right,open=true":{"model":"pyrite:block/azalea_door_top_right_open","y":90}}}

‎common/src/main/resources/assets/pyrite/blockstates/azalea_fence.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"multipart":[{"apply":{"model":"pyrite:block/azalea_fence_post"}},{"apply":{"model":"pyrite:block/azalea_fence_side","uvlock":true},"when":{"north":"true"}},{"apply":{"model":"pyrite:block/azalea_fence_side","uvlock":true,"y":90},"when":{"east":"true"}},{"apply":{"model":"pyrite:block/azalea_fence_side","uvlock":true,"y":180},"when":{"south":"true"}},{"apply":{"model":"pyrite:block/azalea_fence_side","uvlock":true,"y":270},"when":{"west":"true"}}]}

‎common/src/main/resources/assets/pyrite/blockstates/azalea_fence_gate.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"variants":{"facing=east,in_wall=false,open=false":{"model":"pyrite:block/azalea_fence_gate","uvlock":true,"y":270},"facing=east,in_wall=false,open=true":{"model":"pyrite:block/azalea_fence_gate_open","uvlock":true,"y":270},"facing=east,in_wall=true,open=false":{"model":"pyrite:block/azalea_fence_gate_wall","uvlock":true,"y":270},"facing=east,in_wall=true,open=true":{"model":"pyrite:block/azalea_fence_gate_wall_open","uvlock":true,"y":270},"facing=north,in_wall=false,open=false":{"model":"pyrite:block/azalea_fence_gate","uvlock":true,"y":180},"facing=north,in_wall=false,open=true":{"model":"pyrite:block/azalea_fence_gate_open","uvlock":true,"y":180},"facing=north,in_wall=true,open=false":{"model":"pyrite:block/azalea_fence_gate_wall","uvlock":true,"y":180},"facing=north,in_wall=true,open=true":{"model":"pyrite:block/azalea_fence_gate_wall_open","uvlock":true,"y":180},"facing=south,in_wall=false,open=false":{"model":"pyrite:block/azalea_fence_gate","uvlock":true},"facing=south,in_wall=false,open=true":{"model":"pyrite:block/azalea_fence_gate_open","uvlock":true},"facing=south,in_wall=true,open=false":{"model":"pyrite:block/azalea_fence_gate_wall","uvlock":true},"facing=south,in_wall=true,open=true":{"model":"pyrite:block/azalea_fence_gate_wall_open","uvlock":true},"facing=west,in_wall=false,open=false":{"model":"pyrite:block/azalea_fence_gate","uvlock":true,"y":90},"facing=west,in_wall=false,open=true":{"model":"pyrite:block/azalea_fence_gate_open","uvlock":true,"y":90},"facing=west,in_wall=true,open=false":{"model":"pyrite:block/azalea_fence_gate_wall","uvlock":true,"y":90},"facing=west,in_wall=true,open=true":{"model":"pyrite:block/azalea_fence_gate_wall_open","uvlock":true,"y":90}}}

‎common/src/main/resources/assets/pyrite/blockstates/azalea_hanging_sign.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"variants":{"":{"model":"pyrite:block/azalea_hanging_sign"}}}

0 commit comments

Comments
 (0)