mirrors/Flywheel
0
0
Fork 0
mirror of https://github.com/Jozufozu/Flywheel.git synced 2024-11-14 22:43:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Port recent changes

Browse Source
This commit is contained in:
simibubi 2020-11-30 18:54:33 +01:00
parent 2888ba9f39
commit 4ad52b6cc7
5 changed files with 76 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
src/generated/resources/assets/create/blockstates/fluid_pipe.json
View File

@ -60,9 +60,9 @@
},
{
"when": {
"down": "false",
"north": "true",
"up": "true",
"down": "false",
"south": "false"
},
"apply": {
@ -71,9 +71,9 @@
},
{
"when": {
"down": "false",
"north": "false",
"up": "true",
"down": "false",
"south": "true"
},
"apply": {
@ -82,9 +82,9 @@
},
{
"when": {
"down": "true",
"north": "true",
"up": "false",
"down": "true",
"south": "false"
},
"apply": {
@ -93,9 +93,9 @@
},
{
"when": {
"down": "true",
"north": "false",
"up": "false",
"down": "true",
"south": "true"
},
"apply": {
@ -104,9 +104,9 @@
},
{
"when": {
"down": "true",
"north": "false",
"up": "true",
"down": "true",
"south": "false"
},
"apply": {
@ -115,9 +115,9 @@
},
{
"when": {
"north": "false",
"up": "true",
"down": "false",
"north": "false",
"up": "true",
"south": "false"
},
"apply": {
@ -126,9 +126,9 @@
},
{
"when": {
"down": "true",
"north": "false",
"up": "false",
"down": "true",
"south": "false"
},
"apply": {
@ -137,9 +137,9 @@
},
{
"when": {
"down": "false",
"north": "true",
"up": "false",
"down": "false",
"south": "true"
},
"apply": {
@ -148,9 +148,9 @@
},
{
"when": {
"down": "false",
"north": "true",
"up": "false",
"down": "false",
"south": "false"
},
"apply": {
@ -159,9 +159,9 @@
},
{
"when": {
"down": "false",
"north": "false",
"up": "false",
"down": "false",
"south": "true"
},
"apply": {
@ -170,9 +170,9 @@
},
{
"when": {
"down": "false",
"north": "false",
"up": "false",
"down": "false",
"south": "false"
},
"apply": {
@ -182,8 +182,8 @@
{
"when": {
"west": "true",
"east": "false",
"north": "false",
"east": "false",
"south": "true"
},
"apply": {
@ -193,8 +193,8 @@
{
"when": {
"west": "false",
"east": "true",
"north": "false",
"east": "true",
"south": "true"
},
"apply": {
@ -204,8 +204,8 @@
{
"when": {
"west": "true",
"east": "false",
"north": "true",
"east": "false",
"south": "false"
},
"apply": {
@ -215,8 +215,8 @@
{
"when": {
"west": "false",
"east": "true",
"north": "true",
"east": "true",
"south": "false"
},
"apply": {
@ -226,8 +226,8 @@
{
"when": {
"west": "false",
"east": "false",
"north": "true",
"east": "false",
"south": "true"
},
"apply": {
@ -237,8 +237,8 @@
{
"when": {
"west": "false",
"east": "false",
"north": "false",
"east": "false",
"south": "true"
},
"apply": {
@ -248,8 +248,8 @@
{
"when": {
"west": "false",
"east": "false",
"north": "true",
"east": "false",
"south": "false"
},
"apply": {
@ -259,8 +259,8 @@
{
"when": {
"west": "true",
"east": "true",
"north": "false",
"east": "true",
"south": "false"
},
"apply": {
@ -270,8 +270,8 @@
{
"when": {
"west": "true",
"east": "false",
"north": "false",
"east": "false",
"south": "false"
},
"apply": {
@ -281,8 +281,8 @@
{
"when": {
"west": "false",
"north": "false",
"east": "true",
"north": "false",
"south": "false"
},
"apply": {
@ -292,8 +292,8 @@
{
"when": {
"west": "false",
"east": "false",
"north": "false",
"east": "false",
"south": "false"
},
"apply": {
@ -303,9 +303,9 @@
{
"when": {
"west": "false",
"up": "true",
"east": "true",
"down": "false",
"up": "true"
"down": "false"
},
"apply": {
"model": "create:block/fluid_pipe/lu_z"
@ -314,9 +314,9 @@
{
"when": {
"west": "true",
"up": "true",
"east": "false",
"down": "false",
"up": "true"
"down": "false"
},
"apply": {
"model": "create:block/fluid_pipe/ru_z"
@ -325,9 +325,9 @@
{
"when": {
"west": "false",
"up": "false",
"east": "true",
"down": "true",
"up": "false"
"down": "true"
},
"apply": {
"model": "create:block/fluid_pipe/ld_z"
@ -336,9 +336,9 @@
{
"when": {
"west": "true",
"up": "false",
"east": "false",
"down": "true",
"up": "false"
"down": "true"
},
"apply": {
"model": "create:block/fluid_pipe/rd_z"
@ -347,9 +347,9 @@
{
"when": {
"west": "false",
"up": "true",
"east": "false",
"down": "true",
"up": "true"
"down": "true"
},
"apply": {
"model": "create:block/fluid_pipe/ud_z"
@ -358,9 +358,9 @@
{
"when": {
"west": "false",
"up": "true",
"east": "false",
"down": "false",
"up": "true"
"down": "false"
},
"apply": {
"model": "create:block/fluid_pipe/ud_z"
@ -369,9 +369,9 @@
{
"when": {
"west": "false",
"up": "false",
"east": "false",
"down": "true",
"up": "false"
"down": "true"
},
"apply": {
"model": "create:block/fluid_pipe/ud_z"
@ -380,9 +380,9 @@
{
"when": {
"west": "true",
"up": "false",
"east": "true",
"down": "false",
"up": "false"
"down": "false"
},
"apply": {
"model": "create:block/fluid_pipe/lr_z"
@ -391,9 +391,9 @@
{
"when": {
"west": "false",
"up": "false",
"east": "true",
"down": "false",
"up": "false"
"down": "false"
},
"apply": {
"model": "create:block/fluid_pipe/lr_z"
@ -402,9 +402,9 @@
{
"when": {
"west": "true",
"up": "false",
"east": "false",
"down": "false",
"up": "false"
"down": "false"
},
"apply": {
"model": "create:block/fluid_pipe/lr_z"
@ -413,9 +413,9 @@
{
"when": {
"west": "false",
"up": "false",
"east": "false",
"down": "false",
"up": "false"
"down": "false"
},
"apply": {
"model": "create:block/fluid_pipe/none_z"

48
src/generated/resources/assets/create/blockstates/radial_chassis.json
View File

@ -89,8 +89,8 @@
},
{
"when": {
"sticky_west": "true",
"axis": "x"
"axis": "x",
"sticky_west": "true"
},
"apply": {
"model": "create:block/radial_chassis_side_x_sticky",
@ -99,8 +99,8 @@
},
{
"when": {
"sticky_west": "true",
"axis": "y"
"axis": "y",
"sticky_west": "true"
},
"apply": {
"model": "create:block/radial_chassis_side_y_sticky",
@ -109,8 +109,8 @@
},
{
"when": {
"sticky_west": "true",
"axis": "z"
"axis": "z",
"sticky_west": "true"
},
"apply": {
"model": "create:block/radial_chassis_side_z_sticky",
@ -119,8 +119,8 @@
},
{
"when": {
"sticky_west": "false",
"axis": "x"
"axis": "x",
"sticky_west": "false"
},
"apply": {
"model": "create:block/radial_chassis_side_x",
@ -129,8 +129,8 @@
},
{
"when": {
"sticky_west": "false",
"axis": "y"
"axis": "y",
"sticky_west": "false"
},
"apply": {
"model": "create:block/radial_chassis_side_y",
@ -139,8 +139,8 @@
},
{
"when": {
"sticky_west": "false",
"axis": "z"
"axis": "z",
"sticky_west": "false"
},
"apply": {
"model": "create:block/radial_chassis_side_z",
@ -207,8 +207,8 @@
},
{
"when": {
"sticky_east": "true",
"axis": "x"
"axis": "x",
"sticky_east": "true"
},
"apply": {
"model": "create:block/radial_chassis_side_x_sticky",
@ -217,8 +217,8 @@
},
{
"when": {
"sticky_east": "true",
"axis": "y"
"axis": "y",
"sticky_east": "true"
},
"apply": {
"model": "create:block/radial_chassis_side_y_sticky",
@ -227,8 +227,8 @@
},
{
"when": {
"sticky_east": "true",
"axis": "z"
"axis": "z",
"sticky_east": "true"
},
"apply": {
"model": "create:block/radial_chassis_side_z_sticky"
@ -236,8 +236,8 @@
},
{
"when": {
"sticky_east": "false",
"axis": "x"
"axis": "x",
"sticky_east": "false"
},
"apply": {
"model": "create:block/radial_chassis_side_x",
@ -246,8 +246,8 @@
},
{
"when": {
"sticky_east": "false",
"axis": "y"
"axis": "y",
"sticky_east": "false"
},
"apply": {
"model": "create:block/radial_chassis_side_y",
@ -256,8 +256,8 @@
},
{
"when": {
"sticky_east": "false",
"axis": "z"
"axis": "z",
"sticky_east": "false"
},
"apply": {
"model": "create:block/radial_chassis_side_z"

2
src/main/java/com/simibubi/create/AllColorHandlers.java
View File

@ -41,7 +41,7 @@ public class AllColorHandlers {
public static IBlockColor getRedstonePower() {
return new BlockColor(
(state, world, pos, layer) -> RedstoneWireBlock.colorMultiplier(pos != null && world != null ? state.get(BlockStateProperties.POWER_0_15) : 0)
(state, world, pos, layer) -> RedstoneWireBlock.getWireColor(pos != null && world != null ? state.get(BlockStateProperties.POWER_0_15) : 0)
);
}

6
src/main/java/com/simibubi/create/content/contraptions/components/tracks/ControllerRailGenerator.java
View File

@ -7,15 +7,15 @@ import com.tterrag.registrate.providers.RegistrateBlockstateProvider;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.state.IProperty;
import net.minecraft.state.Property;
import net.minecraft.state.properties.RailShape;
import net.minecraftforge.client.model.generators.ModelFile;
public class ControllerRailGenerator extends SpecialBlockStateGen {
@Override
protected IProperty<?>[] getIgnoredProperties() {
return new IProperty<?>[] { ControllerRailBlock.POWER };
protected Property<?>[] getIgnoredProperties() {
return new Property<?>[] { ControllerRailBlock.POWER };
}
@Override

6
src/main/java/com/simibubi/create/foundation/data/SpecialBlockStateGen.java
View File

@ -5,15 +5,15 @@ import com.tterrag.registrate.providers.RegistrateBlockstateProvider;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.state.IProperty;
import net.minecraft.state.Property;
import net.minecraft.util.Direction;
import net.minecraftforge.client.model.generators.ConfiguredModel;
import net.minecraftforge.client.model.generators.ModelFile;
public abstract class SpecialBlockStateGen {
protected IProperty<?>[] getIgnoredProperties() {
return new IProperty<?>[0];
protected Property<?>[] getIgnoredProperties() {
return new Property<?>[0];
}
public final <T extends Block> void generate(DataGenContext<Block, T> ctx, RegistrateBlockstateProvider prov) {