From 22ee3c9dcff72425194121c3a2586f781ba58e8b Mon Sep 17 00:00:00 2001 From: Jika Date: Sat, 27 Sep 2025 14:54:55 +0200 Subject: [PATCH] update tooltip and add 4a hatch --- .../blockstates/hv_kinetic_output_hatch.json | 28 +++++++++++ .../blockstates/lv_kinetic_output_hatch.json | 28 +++++++++++ .../blockstates/mv_kinetic_output_hatch.json | 28 +++++++++++ .../blockstates/ulv_kinetic_output_hatch.json | 28 +++++++++++ .../machine/hv_kinetic_output_hatch.json | 22 +++++++++ .../machine/lv_kinetic_output_hatch.json | 22 +++++++++ .../machine/mv_kinetic_output_hatch.json | 22 +++++++++ .../machine/ulv_kinetic_output_hatch.json | 22 +++++++++ .../models/item/ev_kinetic_output_hatch.json | 3 ++ .../models/item/lv_kinetic_output_hatch.json | 3 ++ .../models/item/mv_kinetic_output_hatch.json | 3 ++ .../models/item/ulv_kinetic_output_hatch.json | 3 ++ .../ev_kinetic_output_hatch_4a.json | 28 +++++++++++ .../iv_kinetic_output_hatch_4a.json | 28 +++++++++++ .../luv_kinetic_output_hatch_4a.json | 28 +++++++++++ .../max_kinetic_output_hatch_4a.json | 28 +++++++++++ .../opv_kinetic_output_hatch_4a.json | 28 +++++++++++ .../uev_kinetic_output_hatch_4a.json | 28 +++++++++++ .../uhv_kinetic_output_hatch_4a.json | 28 +++++++++++ .../uiv_kinetic_output_hatch_4a.json | 28 +++++++++++ .../uv_kinetic_output_hatch_4a.json | 28 +++++++++++ .../uxv_kinetic_output_hatch_4a.json | 28 +++++++++++ .../zpm_kinetic_output_hatch_4a.json | 28 +++++++++++ .../assets/kineticbridge/lang/en_ud.json | 16 +++++-- .../assets/kineticbridge/lang/en_us.json | 16 +++++-- .../machine/ev_kinetic_output_hatch_4a.json | 22 +++++++++ .../machine/iv_kinetic_output_hatch_4a.json | 22 +++++++++ .../machine/luv_kinetic_output_hatch_4a.json | 22 +++++++++ .../machine/max_kinetic_output_hatch_4a.json | 22 +++++++++ .../machine/opv_kinetic_output_hatch_4a.json | 22 +++++++++ .../machine/uev_kinetic_output_hatch_4a.json | 22 +++++++++ .../machine/uhv_kinetic_output_hatch_4a.json | 22 +++++++++ .../machine/uiv_kinetic_output_hatch_4a.json | 22 +++++++++ .../machine/uv_kinetic_output_hatch_4a.json | 22 +++++++++ .../machine/uxv_kinetic_output_hatch_4a.json | 22 +++++++++ .../machine/zpm_kinetic_output_hatch_4a.json | 22 +++++++++ .../item/ev_kinetic_output_hatch_4a.json | 3 ++ .../item/iv_kinetic_output_hatch_4a.json | 3 ++ .../item/luv_kinetic_output_hatch_4a.json | 3 ++ .../item/max_kinetic_output_hatch_4a.json | 3 ++ .../item/opv_kinetic_output_hatch_4a.json | 3 ++ .../item/uev_kinetic_output_hatch_4a.json | 3 ++ .../item/uhv_kinetic_output_hatch_4a.json | 3 ++ .../item/uiv_kinetic_output_hatch_4a.json | 3 ++ .../item/uv_kinetic_output_hatch_4a.json | 3 ++ .../item/uxv_kinetic_output_hatch_4a.json | 3 ++ .../item/zpm_kinetic_output_hatch_4a.json | 3 ++ .../kineticbridge/KineticBridgeMachines.java | 46 +++++++++++++------ .../KineticOutputHatchBlockEntity.java | 21 +++------ .../datagen/KineticBridgeDatagen.java | 4 +- .../KineticOutputHatchPartMachine.java | 1 + .../part/kinetic_output_hatch_4a_overlay.json | 3 ++ 52 files changed, 866 insertions(+), 36 deletions(-) create mode 100644 src/generated/resources/assets/assets/kineticbridge/blockstates/hv_kinetic_output_hatch.json create mode 100644 src/generated/resources/assets/assets/kineticbridge/blockstates/lv_kinetic_output_hatch.json create mode 100644 src/generated/resources/assets/assets/kineticbridge/blockstates/mv_kinetic_output_hatch.json create mode 100644 src/generated/resources/assets/assets/kineticbridge/blockstates/ulv_kinetic_output_hatch.json create mode 100644 src/generated/resources/assets/assets/kineticbridge/models/block/machine/hv_kinetic_output_hatch.json create mode 100644 src/generated/resources/assets/assets/kineticbridge/models/block/machine/lv_kinetic_output_hatch.json create mode 100644 src/generated/resources/assets/assets/kineticbridge/models/block/machine/mv_kinetic_output_hatch.json create mode 100644 src/generated/resources/assets/assets/kineticbridge/models/block/machine/ulv_kinetic_output_hatch.json create mode 100644 src/generated/resources/assets/assets/kineticbridge/models/item/ev_kinetic_output_hatch.json create mode 100644 src/generated/resources/assets/assets/kineticbridge/models/item/lv_kinetic_output_hatch.json create mode 100644 src/generated/resources/assets/assets/kineticbridge/models/item/mv_kinetic_output_hatch.json create mode 100644 src/generated/resources/assets/assets/kineticbridge/models/item/ulv_kinetic_output_hatch.json create mode 100644 src/generated/resources/assets/kineticbridge/blockstates/ev_kinetic_output_hatch_4a.json create mode 100644 src/generated/resources/assets/kineticbridge/blockstates/iv_kinetic_output_hatch_4a.json create mode 100644 src/generated/resources/assets/kineticbridge/blockstates/luv_kinetic_output_hatch_4a.json create mode 100644 src/generated/resources/assets/kineticbridge/blockstates/max_kinetic_output_hatch_4a.json create mode 100644 src/generated/resources/assets/kineticbridge/blockstates/opv_kinetic_output_hatch_4a.json create mode 100644 src/generated/resources/assets/kineticbridge/blockstates/uev_kinetic_output_hatch_4a.json create mode 100644 src/generated/resources/assets/kineticbridge/blockstates/uhv_kinetic_output_hatch_4a.json create mode 100644 src/generated/resources/assets/kineticbridge/blockstates/uiv_kinetic_output_hatch_4a.json create mode 100644 src/generated/resources/assets/kineticbridge/blockstates/uv_kinetic_output_hatch_4a.json create mode 100644 src/generated/resources/assets/kineticbridge/blockstates/uxv_kinetic_output_hatch_4a.json create mode 100644 src/generated/resources/assets/kineticbridge/blockstates/zpm_kinetic_output_hatch_4a.json create mode 100644 src/generated/resources/assets/kineticbridge/models/block/machine/ev_kinetic_output_hatch_4a.json create mode 100644 src/generated/resources/assets/kineticbridge/models/block/machine/iv_kinetic_output_hatch_4a.json create mode 100644 src/generated/resources/assets/kineticbridge/models/block/machine/luv_kinetic_output_hatch_4a.json create mode 100644 src/generated/resources/assets/kineticbridge/models/block/machine/max_kinetic_output_hatch_4a.json create mode 100644 src/generated/resources/assets/kineticbridge/models/block/machine/opv_kinetic_output_hatch_4a.json create mode 100644 src/generated/resources/assets/kineticbridge/models/block/machine/uev_kinetic_output_hatch_4a.json create mode 100644 src/generated/resources/assets/kineticbridge/models/block/machine/uhv_kinetic_output_hatch_4a.json create mode 100644 src/generated/resources/assets/kineticbridge/models/block/machine/uiv_kinetic_output_hatch_4a.json create mode 100644 src/generated/resources/assets/kineticbridge/models/block/machine/uv_kinetic_output_hatch_4a.json create mode 100644 src/generated/resources/assets/kineticbridge/models/block/machine/uxv_kinetic_output_hatch_4a.json create mode 100644 src/generated/resources/assets/kineticbridge/models/block/machine/zpm_kinetic_output_hatch_4a.json create mode 100644 src/generated/resources/assets/kineticbridge/models/item/ev_kinetic_output_hatch_4a.json create mode 100644 src/generated/resources/assets/kineticbridge/models/item/iv_kinetic_output_hatch_4a.json create mode 100644 src/generated/resources/assets/kineticbridge/models/item/luv_kinetic_output_hatch_4a.json create mode 100644 src/generated/resources/assets/kineticbridge/models/item/max_kinetic_output_hatch_4a.json create mode 100644 src/generated/resources/assets/kineticbridge/models/item/opv_kinetic_output_hatch_4a.json create mode 100644 src/generated/resources/assets/kineticbridge/models/item/uev_kinetic_output_hatch_4a.json create mode 100644 src/generated/resources/assets/kineticbridge/models/item/uhv_kinetic_output_hatch_4a.json create mode 100644 src/generated/resources/assets/kineticbridge/models/item/uiv_kinetic_output_hatch_4a.json create mode 100644 src/generated/resources/assets/kineticbridge/models/item/uv_kinetic_output_hatch_4a.json create mode 100644 src/generated/resources/assets/kineticbridge/models/item/uxv_kinetic_output_hatch_4a.json create mode 100644 src/generated/resources/assets/kineticbridge/models/item/zpm_kinetic_output_hatch_4a.json create mode 100644 src/main/resources/assets/kineticbridge/models/block/machine/part/kinetic_output_hatch_4a_overlay.json diff --git a/src/generated/resources/assets/assets/kineticbridge/blockstates/hv_kinetic_output_hatch.json b/src/generated/resources/assets/assets/kineticbridge/blockstates/hv_kinetic_output_hatch.json new file mode 100644 index 0000000..2fd0e6b --- /dev/null +++ b/src/generated/resources/assets/assets/kineticbridge/blockstates/hv_kinetic_output_hatch.json @@ -0,0 +1,28 @@ +{ + "variants": { + "facing=down": { + "model": "kineticbridge:block/machine/hv_kinetic_output_hatch", + "x": 90 + }, + "facing=east": { + "model": "kineticbridge:block/machine/hv_kinetic_output_hatch", + "y": 90 + }, + "facing=north": { + "model": "kineticbridge:block/machine/hv_kinetic_output_hatch" + }, + "facing=south": { + "model": "kineticbridge:block/machine/hv_kinetic_output_hatch", + "y": 180 + }, + "facing=up": { + "gtceu:z": 180, + "model": "kineticbridge:block/machine/hv_kinetic_output_hatch", + "x": 270 + }, + "facing=west": { + "model": "kineticbridge:block/machine/hv_kinetic_output_hatch", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/assets/kineticbridge/blockstates/lv_kinetic_output_hatch.json b/src/generated/resources/assets/assets/kineticbridge/blockstates/lv_kinetic_output_hatch.json new file mode 100644 index 0000000..7d7d2d0 --- /dev/null +++ b/src/generated/resources/assets/assets/kineticbridge/blockstates/lv_kinetic_output_hatch.json @@ -0,0 +1,28 @@ +{ + "variants": { + "facing=down": { + "model": "kineticbridge:block/machine/lv_kinetic_output_hatch", + "x": 90 + }, + "facing=east": { + "model": "kineticbridge:block/machine/lv_kinetic_output_hatch", + "y": 90 + }, + "facing=north": { + "model": "kineticbridge:block/machine/lv_kinetic_output_hatch" + }, + "facing=south": { + "model": "kineticbridge:block/machine/lv_kinetic_output_hatch", + "y": 180 + }, + "facing=up": { + "gtceu:z": 180, + "model": "kineticbridge:block/machine/lv_kinetic_output_hatch", + "x": 270 + }, + "facing=west": { + "model": "kineticbridge:block/machine/lv_kinetic_output_hatch", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/assets/kineticbridge/blockstates/mv_kinetic_output_hatch.json b/src/generated/resources/assets/assets/kineticbridge/blockstates/mv_kinetic_output_hatch.json new file mode 100644 index 0000000..04ae232 --- /dev/null +++ b/src/generated/resources/assets/assets/kineticbridge/blockstates/mv_kinetic_output_hatch.json @@ -0,0 +1,28 @@ +{ + "variants": { + "facing=down": { + "model": "kineticbridge:block/machine/mv_kinetic_output_hatch", + "x": 90 + }, + "facing=east": { + "model": "kineticbridge:block/machine/mv_kinetic_output_hatch", + "y": 90 + }, + "facing=north": { + "model": "kineticbridge:block/machine/mv_kinetic_output_hatch" + }, + "facing=south": { + "model": "kineticbridge:block/machine/mv_kinetic_output_hatch", + "y": 180 + }, + "facing=up": { + "gtceu:z": 180, + "model": "kineticbridge:block/machine/mv_kinetic_output_hatch", + "x": 270 + }, + "facing=west": { + "model": "kineticbridge:block/machine/mv_kinetic_output_hatch", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/assets/kineticbridge/blockstates/ulv_kinetic_output_hatch.json b/src/generated/resources/assets/assets/kineticbridge/blockstates/ulv_kinetic_output_hatch.json new file mode 100644 index 0000000..beb0c08 --- /dev/null +++ b/src/generated/resources/assets/assets/kineticbridge/blockstates/ulv_kinetic_output_hatch.json @@ -0,0 +1,28 @@ +{ + "variants": { + "facing=down": { + "model": "kineticbridge:block/machine/ulv_kinetic_output_hatch", + "x": 90 + }, + "facing=east": { + "model": "kineticbridge:block/machine/ulv_kinetic_output_hatch", + "y": 90 + }, + "facing=north": { + "model": "kineticbridge:block/machine/ulv_kinetic_output_hatch" + }, + "facing=south": { + "model": "kineticbridge:block/machine/ulv_kinetic_output_hatch", + "y": 180 + }, + "facing=up": { + "gtceu:z": 180, + "model": "kineticbridge:block/machine/ulv_kinetic_output_hatch", + "x": 270 + }, + "facing=west": { + "model": "kineticbridge:block/machine/ulv_kinetic_output_hatch", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/assets/kineticbridge/models/block/machine/hv_kinetic_output_hatch.json b/src/generated/resources/assets/assets/kineticbridge/models/block/machine/hv_kinetic_output_hatch.json new file mode 100644 index 0000000..a553f5b --- /dev/null +++ b/src/generated/resources/assets/assets/kineticbridge/models/block/machine/hv_kinetic_output_hatch.json @@ -0,0 +1,22 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "kineticbridge:hv_kinetic_output_hatch", + "replaceable_textures": [ + "bottom", + "top", + "side" + ], + "variants": { + "": { + "model": { + "parent": "gtceu:block/machine/part/energy_output_hatch", + "textures": { + "bottom": "gtceu:block/casings/voltage/hv/bottom", + "side": "gtceu:block/casings/voltage/hv/side", + "top": "gtceu:block/casings/voltage/hv/top" + } + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/assets/kineticbridge/models/block/machine/lv_kinetic_output_hatch.json b/src/generated/resources/assets/assets/kineticbridge/models/block/machine/lv_kinetic_output_hatch.json new file mode 100644 index 0000000..0be3441 --- /dev/null +++ b/src/generated/resources/assets/assets/kineticbridge/models/block/machine/lv_kinetic_output_hatch.json @@ -0,0 +1,22 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "kineticbridge:lv_kinetic_output_hatch", + "replaceable_textures": [ + "bottom", + "top", + "side" + ], + "variants": { + "": { + "model": { + "parent": "gtceu:block/machine/part/energy_output_hatch", + "textures": { + "bottom": "gtceu:block/casings/voltage/lv/bottom", + "side": "gtceu:block/casings/voltage/lv/side", + "top": "gtceu:block/casings/voltage/lv/top" + } + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/assets/kineticbridge/models/block/machine/mv_kinetic_output_hatch.json b/src/generated/resources/assets/assets/kineticbridge/models/block/machine/mv_kinetic_output_hatch.json new file mode 100644 index 0000000..c39202a --- /dev/null +++ b/src/generated/resources/assets/assets/kineticbridge/models/block/machine/mv_kinetic_output_hatch.json @@ -0,0 +1,22 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "kineticbridge:mv_kinetic_output_hatch", + "replaceable_textures": [ + "bottom", + "top", + "side" + ], + "variants": { + "": { + "model": { + "parent": "gtceu:block/machine/part/energy_output_hatch", + "textures": { + "bottom": "gtceu:block/casings/voltage/mv/bottom", + "side": "gtceu:block/casings/voltage/mv/side", + "top": "gtceu:block/casings/voltage/mv/top" + } + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/assets/kineticbridge/models/block/machine/ulv_kinetic_output_hatch.json b/src/generated/resources/assets/assets/kineticbridge/models/block/machine/ulv_kinetic_output_hatch.json new file mode 100644 index 0000000..469e987 --- /dev/null +++ b/src/generated/resources/assets/assets/kineticbridge/models/block/machine/ulv_kinetic_output_hatch.json @@ -0,0 +1,22 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "kineticbridge:ulv_kinetic_output_hatch", + "replaceable_textures": [ + "bottom", + "top", + "side" + ], + "variants": { + "": { + "model": { + "parent": "gtceu:block/machine/part/energy_output_hatch", + "textures": { + "bottom": "gtceu:block/casings/voltage/ulv/bottom", + "side": "gtceu:block/casings/voltage/ulv/side", + "top": "gtceu:block/casings/voltage/ulv/top" + } + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/assets/kineticbridge/models/item/ev_kinetic_output_hatch.json b/src/generated/resources/assets/assets/kineticbridge/models/item/ev_kinetic_output_hatch.json new file mode 100644 index 0000000..116fc2f --- /dev/null +++ b/src/generated/resources/assets/assets/kineticbridge/models/item/ev_kinetic_output_hatch.json @@ -0,0 +1,3 @@ +{ + "parent": "kineticbridge:block/machine/ev_kinetic_output_hatch" +} \ No newline at end of file diff --git a/src/generated/resources/assets/assets/kineticbridge/models/item/lv_kinetic_output_hatch.json b/src/generated/resources/assets/assets/kineticbridge/models/item/lv_kinetic_output_hatch.json new file mode 100644 index 0000000..fd22745 --- /dev/null +++ b/src/generated/resources/assets/assets/kineticbridge/models/item/lv_kinetic_output_hatch.json @@ -0,0 +1,3 @@ +{ + "parent": "kineticbridge:block/machine/lv_kinetic_output_hatch" +} \ No newline at end of file diff --git a/src/generated/resources/assets/assets/kineticbridge/models/item/mv_kinetic_output_hatch.json b/src/generated/resources/assets/assets/kineticbridge/models/item/mv_kinetic_output_hatch.json new file mode 100644 index 0000000..ebe4061 --- /dev/null +++ b/src/generated/resources/assets/assets/kineticbridge/models/item/mv_kinetic_output_hatch.json @@ -0,0 +1,3 @@ +{ + "parent": "kineticbridge:block/machine/mv_kinetic_output_hatch" +} \ No newline at end of file diff --git a/src/generated/resources/assets/assets/kineticbridge/models/item/ulv_kinetic_output_hatch.json b/src/generated/resources/assets/assets/kineticbridge/models/item/ulv_kinetic_output_hatch.json new file mode 100644 index 0000000..15944b1 --- /dev/null +++ b/src/generated/resources/assets/assets/kineticbridge/models/item/ulv_kinetic_output_hatch.json @@ -0,0 +1,3 @@ +{ + "parent": "kineticbridge:block/machine/ulv_kinetic_output_hatch" +} \ No newline at end of file diff --git a/src/generated/resources/assets/kineticbridge/blockstates/ev_kinetic_output_hatch_4a.json b/src/generated/resources/assets/kineticbridge/blockstates/ev_kinetic_output_hatch_4a.json new file mode 100644 index 0000000..cbfe257 --- /dev/null +++ b/src/generated/resources/assets/kineticbridge/blockstates/ev_kinetic_output_hatch_4a.json @@ -0,0 +1,28 @@ +{ + "variants": { + "facing=down": { + "model": "kineticbridge:block/machine/ev_kinetic_output_hatch_4a", + "x": 90 + }, + "facing=east": { + "model": "kineticbridge:block/machine/ev_kinetic_output_hatch_4a", + "y": 90 + }, + "facing=north": { + "model": "kineticbridge:block/machine/ev_kinetic_output_hatch_4a" + }, + "facing=south": { + "model": "kineticbridge:block/machine/ev_kinetic_output_hatch_4a", + "y": 180 + }, + "facing=up": { + "gtceu:z": 180, + "model": "kineticbridge:block/machine/ev_kinetic_output_hatch_4a", + "x": 270 + }, + "facing=west": { + "model": "kineticbridge:block/machine/ev_kinetic_output_hatch_4a", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/kineticbridge/blockstates/iv_kinetic_output_hatch_4a.json b/src/generated/resources/assets/kineticbridge/blockstates/iv_kinetic_output_hatch_4a.json new file mode 100644 index 0000000..279a6dc --- /dev/null +++ b/src/generated/resources/assets/kineticbridge/blockstates/iv_kinetic_output_hatch_4a.json @@ -0,0 +1,28 @@ +{ + "variants": { + "facing=down": { + "model": "kineticbridge:block/machine/iv_kinetic_output_hatch_4a", + "x": 90 + }, + "facing=east": { + "model": "kineticbridge:block/machine/iv_kinetic_output_hatch_4a", + "y": 90 + }, + "facing=north": { + "model": "kineticbridge:block/machine/iv_kinetic_output_hatch_4a" + }, + "facing=south": { + "model": "kineticbridge:block/machine/iv_kinetic_output_hatch_4a", + "y": 180 + }, + "facing=up": { + "gtceu:z": 180, + "model": "kineticbridge:block/machine/iv_kinetic_output_hatch_4a", + "x": 270 + }, + "facing=west": { + "model": "kineticbridge:block/machine/iv_kinetic_output_hatch_4a", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/kineticbridge/blockstates/luv_kinetic_output_hatch_4a.json b/src/generated/resources/assets/kineticbridge/blockstates/luv_kinetic_output_hatch_4a.json new file mode 100644 index 0000000..cf981a3 --- /dev/null +++ b/src/generated/resources/assets/kineticbridge/blockstates/luv_kinetic_output_hatch_4a.json @@ -0,0 +1,28 @@ +{ + "variants": { + "facing=down": { + "model": "kineticbridge:block/machine/luv_kinetic_output_hatch_4a", + "x": 90 + }, + "facing=east": { + "model": "kineticbridge:block/machine/luv_kinetic_output_hatch_4a", + "y": 90 + }, + "facing=north": { + "model": "kineticbridge:block/machine/luv_kinetic_output_hatch_4a" + }, + "facing=south": { + "model": "kineticbridge:block/machine/luv_kinetic_output_hatch_4a", + "y": 180 + }, + "facing=up": { + "gtceu:z": 180, + "model": "kineticbridge:block/machine/luv_kinetic_output_hatch_4a", + "x": 270 + }, + "facing=west": { + "model": "kineticbridge:block/machine/luv_kinetic_output_hatch_4a", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/kineticbridge/blockstates/max_kinetic_output_hatch_4a.json b/src/generated/resources/assets/kineticbridge/blockstates/max_kinetic_output_hatch_4a.json new file mode 100644 index 0000000..2015701 --- /dev/null +++ b/src/generated/resources/assets/kineticbridge/blockstates/max_kinetic_output_hatch_4a.json @@ -0,0 +1,28 @@ +{ + "variants": { + "facing=down": { + "model": "kineticbridge:block/machine/max_kinetic_output_hatch_4a", + "x": 90 + }, + "facing=east": { + "model": "kineticbridge:block/machine/max_kinetic_output_hatch_4a", + "y": 90 + }, + "facing=north": { + "model": "kineticbridge:block/machine/max_kinetic_output_hatch_4a" + }, + "facing=south": { + "model": "kineticbridge:block/machine/max_kinetic_output_hatch_4a", + "y": 180 + }, + "facing=up": { + "gtceu:z": 180, + "model": "kineticbridge:block/machine/max_kinetic_output_hatch_4a", + "x": 270 + }, + "facing=west": { + "model": "kineticbridge:block/machine/max_kinetic_output_hatch_4a", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/kineticbridge/blockstates/opv_kinetic_output_hatch_4a.json b/src/generated/resources/assets/kineticbridge/blockstates/opv_kinetic_output_hatch_4a.json new file mode 100644 index 0000000..c850e1a --- /dev/null +++ b/src/generated/resources/assets/kineticbridge/blockstates/opv_kinetic_output_hatch_4a.json @@ -0,0 +1,28 @@ +{ + "variants": { + "facing=down": { + "model": "kineticbridge:block/machine/opv_kinetic_output_hatch_4a", + "x": 90 + }, + "facing=east": { + "model": "kineticbridge:block/machine/opv_kinetic_output_hatch_4a", + "y": 90 + }, + "facing=north": { + "model": "kineticbridge:block/machine/opv_kinetic_output_hatch_4a" + }, + "facing=south": { + "model": "kineticbridge:block/machine/opv_kinetic_output_hatch_4a", + "y": 180 + }, + "facing=up": { + "gtceu:z": 180, + "model": "kineticbridge:block/machine/opv_kinetic_output_hatch_4a", + "x": 270 + }, + "facing=west": { + "model": "kineticbridge:block/machine/opv_kinetic_output_hatch_4a", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/kineticbridge/blockstates/uev_kinetic_output_hatch_4a.json b/src/generated/resources/assets/kineticbridge/blockstates/uev_kinetic_output_hatch_4a.json new file mode 100644 index 0000000..6c87dd6 --- /dev/null +++ b/src/generated/resources/assets/kineticbridge/blockstates/uev_kinetic_output_hatch_4a.json @@ -0,0 +1,28 @@ +{ + "variants": { + "facing=down": { + "model": "kineticbridge:block/machine/uev_kinetic_output_hatch_4a", + "x": 90 + }, + "facing=east": { + "model": "kineticbridge:block/machine/uev_kinetic_output_hatch_4a", + "y": 90 + }, + "facing=north": { + "model": "kineticbridge:block/machine/uev_kinetic_output_hatch_4a" + }, + "facing=south": { + "model": "kineticbridge:block/machine/uev_kinetic_output_hatch_4a", + "y": 180 + }, + "facing=up": { + "gtceu:z": 180, + "model": "kineticbridge:block/machine/uev_kinetic_output_hatch_4a", + "x": 270 + }, + "facing=west": { + "model": "kineticbridge:block/machine/uev_kinetic_output_hatch_4a", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/kineticbridge/blockstates/uhv_kinetic_output_hatch_4a.json b/src/generated/resources/assets/kineticbridge/blockstates/uhv_kinetic_output_hatch_4a.json new file mode 100644 index 0000000..e81617c --- /dev/null +++ b/src/generated/resources/assets/kineticbridge/blockstates/uhv_kinetic_output_hatch_4a.json @@ -0,0 +1,28 @@ +{ + "variants": { + "facing=down": { + "model": "kineticbridge:block/machine/uhv_kinetic_output_hatch_4a", + "x": 90 + }, + "facing=east": { + "model": "kineticbridge:block/machine/uhv_kinetic_output_hatch_4a", + "y": 90 + }, + "facing=north": { + "model": "kineticbridge:block/machine/uhv_kinetic_output_hatch_4a" + }, + "facing=south": { + "model": "kineticbridge:block/machine/uhv_kinetic_output_hatch_4a", + "y": 180 + }, + "facing=up": { + "gtceu:z": 180, + "model": "kineticbridge:block/machine/uhv_kinetic_output_hatch_4a", + "x": 270 + }, + "facing=west": { + "model": "kineticbridge:block/machine/uhv_kinetic_output_hatch_4a", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/kineticbridge/blockstates/uiv_kinetic_output_hatch_4a.json b/src/generated/resources/assets/kineticbridge/blockstates/uiv_kinetic_output_hatch_4a.json new file mode 100644 index 0000000..e6bd595 --- /dev/null +++ b/src/generated/resources/assets/kineticbridge/blockstates/uiv_kinetic_output_hatch_4a.json @@ -0,0 +1,28 @@ +{ + "variants": { + "facing=down": { + "model": "kineticbridge:block/machine/uiv_kinetic_output_hatch_4a", + "x": 90 + }, + "facing=east": { + "model": "kineticbridge:block/machine/uiv_kinetic_output_hatch_4a", + "y": 90 + }, + "facing=north": { + "model": "kineticbridge:block/machine/uiv_kinetic_output_hatch_4a" + }, + "facing=south": { + "model": "kineticbridge:block/machine/uiv_kinetic_output_hatch_4a", + "y": 180 + }, + "facing=up": { + "gtceu:z": 180, + "model": "kineticbridge:block/machine/uiv_kinetic_output_hatch_4a", + "x": 270 + }, + "facing=west": { + "model": "kineticbridge:block/machine/uiv_kinetic_output_hatch_4a", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/kineticbridge/blockstates/uv_kinetic_output_hatch_4a.json b/src/generated/resources/assets/kineticbridge/blockstates/uv_kinetic_output_hatch_4a.json new file mode 100644 index 0000000..dcec84b --- /dev/null +++ b/src/generated/resources/assets/kineticbridge/blockstates/uv_kinetic_output_hatch_4a.json @@ -0,0 +1,28 @@ +{ + "variants": { + "facing=down": { + "model": "kineticbridge:block/machine/uv_kinetic_output_hatch_4a", + "x": 90 + }, + "facing=east": { + "model": "kineticbridge:block/machine/uv_kinetic_output_hatch_4a", + "y": 90 + }, + "facing=north": { + "model": "kineticbridge:block/machine/uv_kinetic_output_hatch_4a" + }, + "facing=south": { + "model": "kineticbridge:block/machine/uv_kinetic_output_hatch_4a", + "y": 180 + }, + "facing=up": { + "gtceu:z": 180, + "model": "kineticbridge:block/machine/uv_kinetic_output_hatch_4a", + "x": 270 + }, + "facing=west": { + "model": "kineticbridge:block/machine/uv_kinetic_output_hatch_4a", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/kineticbridge/blockstates/uxv_kinetic_output_hatch_4a.json b/src/generated/resources/assets/kineticbridge/blockstates/uxv_kinetic_output_hatch_4a.json new file mode 100644 index 0000000..ef53e9c --- /dev/null +++ b/src/generated/resources/assets/kineticbridge/blockstates/uxv_kinetic_output_hatch_4a.json @@ -0,0 +1,28 @@ +{ + "variants": { + "facing=down": { + "model": "kineticbridge:block/machine/uxv_kinetic_output_hatch_4a", + "x": 90 + }, + "facing=east": { + "model": "kineticbridge:block/machine/uxv_kinetic_output_hatch_4a", + "y": 90 + }, + "facing=north": { + "model": "kineticbridge:block/machine/uxv_kinetic_output_hatch_4a" + }, + "facing=south": { + "model": "kineticbridge:block/machine/uxv_kinetic_output_hatch_4a", + "y": 180 + }, + "facing=up": { + "gtceu:z": 180, + "model": "kineticbridge:block/machine/uxv_kinetic_output_hatch_4a", + "x": 270 + }, + "facing=west": { + "model": "kineticbridge:block/machine/uxv_kinetic_output_hatch_4a", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/kineticbridge/blockstates/zpm_kinetic_output_hatch_4a.json b/src/generated/resources/assets/kineticbridge/blockstates/zpm_kinetic_output_hatch_4a.json new file mode 100644 index 0000000..bfb6248 --- /dev/null +++ b/src/generated/resources/assets/kineticbridge/blockstates/zpm_kinetic_output_hatch_4a.json @@ -0,0 +1,28 @@ +{ + "variants": { + "facing=down": { + "model": "kineticbridge:block/machine/zpm_kinetic_output_hatch_4a", + "x": 90 + }, + "facing=east": { + "model": "kineticbridge:block/machine/zpm_kinetic_output_hatch_4a", + "y": 90 + }, + "facing=north": { + "model": "kineticbridge:block/machine/zpm_kinetic_output_hatch_4a" + }, + "facing=south": { + "model": "kineticbridge:block/machine/zpm_kinetic_output_hatch_4a", + "y": 180 + }, + "facing=up": { + "gtceu:z": 180, + "model": "kineticbridge:block/machine/zpm_kinetic_output_hatch_4a", + "x": 270 + }, + "facing=west": { + "model": "kineticbridge:block/machine/zpm_kinetic_output_hatch_4a", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/kineticbridge/lang/en_ud.json b/src/generated/resources/assets/kineticbridge/lang/en_ud.json index 0c520c3..5c7c192 100644 --- a/src/generated/resources/assets/kineticbridge/lang/en_ud.json +++ b/src/generated/resources/assets/kineticbridge/lang/en_ud.json @@ -1,22 +1,32 @@ { "block.kineticbridge.ev_kinetic_output_hatch": "ɥɔʇɐH ʇndʇnO ɔıʇǝuıʞ ΛƎϛ§", + "block.kineticbridge.ev_kinetic_output_hatch_4a": "ɥɔʇɐH ʇndʇnO ɔıʇǝuıʞ ɥbıH ΛƎϛ§", "block.kineticbridge.hv_kinetic_output_hatch": "ɥɔʇɐH ʇndʇnO ɔıʇǝuıʞ ΛH9§", "block.kineticbridge.iv_kinetic_output_hatch": "ɥɔʇɐH ʇndʇnO ɔıʇǝuıʞ ΛI6§", + "block.kineticbridge.iv_kinetic_output_hatch_4a": "ɥɔʇɐH ʇndʇnO ɔıʇǝuıʞ ɥbıH ΛI6§", "block.kineticbridge.luv_kinetic_output_hatch": "ɥɔʇɐH ʇndʇnO ɔıʇǝuıʞ ΛnꞀp§", + "block.kineticbridge.luv_kinetic_output_hatch_4a": "ɥɔʇɐH ʇndʇnO ɔıʇǝuıʞ ɥbıH ΛnꞀp§", "block.kineticbridge.lv_kinetic_output_hatch": "ɥɔʇɐH ʇndʇnO ɔıʇǝuıʞ ΛꞀㄥ§", "block.kineticbridge.max_kinetic_output_hatch": "ɥɔʇɐH ʇndʇnO ɔıʇǝuıʞ XⱯWן§ɔ§", + "block.kineticbridge.max_kinetic_output_hatch_4a": "ɥɔʇɐH ʇndʇnO ɔıʇǝuıʞ ɥbıH XⱯWן§ɔ§", "block.kineticbridge.mv_kinetic_output_hatch": "ɥɔʇɐH ʇndʇnO ɔıʇǝuıʞ ΛWq§", "block.kineticbridge.opv_kinetic_output_hatch": "ɥɔʇɐH ʇndʇnO ɔıʇǝuıʞ ΛdOן§6§", + "block.kineticbridge.opv_kinetic_output_hatch_4a": "ɥɔʇɐH ʇndʇnO ɔıʇǝuıʞ ɥbıH ΛdOן§6§", "block.kineticbridge.uev_kinetic_output_hatch": "ɥɔʇɐH ʇndʇnO ɔıʇǝuıʞ ΛƎ∩ɐ§", + "block.kineticbridge.uev_kinetic_output_hatch_4a": "ɥɔʇɐH ʇndʇnO ɔıʇǝuıʞ ɥbıH ΛƎ∩ɐ§", "block.kineticbridge.uhv_kinetic_output_hatch": "ɥɔʇɐH ʇndʇnO ɔıʇǝuıʞ ΛH∩ㄣ§", + "block.kineticbridge.uhv_kinetic_output_hatch_4a": "ɥɔʇɐH ʇndʇnO ɔıʇǝuıʞ ɥbıH ΛH∩ㄣ§", "block.kineticbridge.uiv_kinetic_output_hatch": "ɥɔʇɐH ʇndʇnO ɔıʇǝuıʞ ΛI∩ᄅ§", + "block.kineticbridge.uiv_kinetic_output_hatch_4a": "ɥɔʇɐH ʇndʇnO ɔıʇǝuıʞ ɥbıH ΛI∩ᄅ§", "block.kineticbridge.ulv_kinetic_output_hatch": "ɥɔʇɐH ʇndʇnO ɔıʇǝuıʞ ΛꞀ∩8§", "block.kineticbridge.uv_kinetic_output_hatch": "ɥɔʇɐH ʇndʇnO ɔıʇǝuıʞ Λ∩Ɛ§", + "block.kineticbridge.uv_kinetic_output_hatch_4a": "ɥɔʇɐH ʇndʇnO ɔıʇǝuıʞ ɥbıH Λ∩Ɛ§", "block.kineticbridge.uxv_kinetic_output_hatch": "ɥɔʇɐH ʇndʇnO ɔıʇǝuıʞ ΛX∩ǝ§", + "block.kineticbridge.uxv_kinetic_output_hatch_4a": "ɥɔʇɐH ʇndʇnO ɔıʇǝuıʞ ɥbıH ΛX∩ǝ§", "block.kineticbridge.zpm_kinetic_output_hatch": "ɥɔʇɐH ʇndʇnO ɔıʇǝuıʞ WԀZɔ§", - "kineticbridge.tooltip.capacity": ")ʇ/∩Ǝ %s~( ∩S %s oʇ dn sǝpıʌoɹԀ", - "kineticbridge.tooltip.rpm": "WԀᴚ %s ʇɐ uoıʇɐʇoɹ ǝʇɐǝɹƆ sʇndʇnO", - "tooltip.kineticbridge.last_tick_power": "∩Ǝ %s :ʍɐɹᗡ ʞɔı⟘ ʇsɐꞀ", + "block.kineticbridge.zpm_kinetic_output_hatch_4a": "ɥɔʇɐH ʇndʇnO ɔıʇǝuıʞ ɥbıH WԀZɔ§", + "kineticbridge.energy_hatch.output.kinetic": ")ʇ/∩Ǝ %s~( WԀᴚ %s oʇ dn @ ∩S %s sǝpıʌoɹԀq§", + "kineticbridge.energy_hatch.output.tooltip": "sʞɔoןqıʇןnW ɹoɟ ʇndʇnO ʎbɹǝuƎ ɔıʇǝuıʞ", "tooltip.kineticbridge.max_power": "ʇ/∩Ǝ %s :ʇndʇnO xɐW", "tooltip.kineticbridge.max_stress": "WԀᴚ %s @ ∩S %s :ʎʇıɔɐdɐƆ ǝʌıʇɔⱯ" } \ No newline at end of file diff --git a/src/generated/resources/assets/kineticbridge/lang/en_us.json b/src/generated/resources/assets/kineticbridge/lang/en_us.json index 538c494..975b524 100644 --- a/src/generated/resources/assets/kineticbridge/lang/en_us.json +++ b/src/generated/resources/assets/kineticbridge/lang/en_us.json @@ -1,22 +1,32 @@ { "block.kineticbridge.ev_kinetic_output_hatch": "§5EV Kinetic Output Hatch", + "block.kineticbridge.ev_kinetic_output_hatch_4a": "§5EV High Kinetic Output Hatch", "block.kineticbridge.hv_kinetic_output_hatch": "§6HV Kinetic Output Hatch", "block.kineticbridge.iv_kinetic_output_hatch": "§9IV Kinetic Output Hatch", + "block.kineticbridge.iv_kinetic_output_hatch_4a": "§9IV High Kinetic Output Hatch", "block.kineticbridge.luv_kinetic_output_hatch": "§dLuV Kinetic Output Hatch", + "block.kineticbridge.luv_kinetic_output_hatch_4a": "§dLuV High Kinetic Output Hatch", "block.kineticbridge.lv_kinetic_output_hatch": "§7LV Kinetic Output Hatch", "block.kineticbridge.max_kinetic_output_hatch": "§c§lMAX Kinetic Output Hatch", + "block.kineticbridge.max_kinetic_output_hatch_4a": "§c§lMAX High Kinetic Output Hatch", "block.kineticbridge.mv_kinetic_output_hatch": "§bMV Kinetic Output Hatch", "block.kineticbridge.opv_kinetic_output_hatch": "§9§lOpV Kinetic Output Hatch", + "block.kineticbridge.opv_kinetic_output_hatch_4a": "§9§lOpV High Kinetic Output Hatch", "block.kineticbridge.uev_kinetic_output_hatch": "§aUEV Kinetic Output Hatch", + "block.kineticbridge.uev_kinetic_output_hatch_4a": "§aUEV High Kinetic Output Hatch", "block.kineticbridge.uhv_kinetic_output_hatch": "§4UHV Kinetic Output Hatch", + "block.kineticbridge.uhv_kinetic_output_hatch_4a": "§4UHV High Kinetic Output Hatch", "block.kineticbridge.uiv_kinetic_output_hatch": "§2UIV Kinetic Output Hatch", + "block.kineticbridge.uiv_kinetic_output_hatch_4a": "§2UIV High Kinetic Output Hatch", "block.kineticbridge.ulv_kinetic_output_hatch": "§8ULV Kinetic Output Hatch", "block.kineticbridge.uv_kinetic_output_hatch": "§3UV Kinetic Output Hatch", + "block.kineticbridge.uv_kinetic_output_hatch_4a": "§3UV High Kinetic Output Hatch", "block.kineticbridge.uxv_kinetic_output_hatch": "§eUXV Kinetic Output Hatch", + "block.kineticbridge.uxv_kinetic_output_hatch_4a": "§eUXV High Kinetic Output Hatch", "block.kineticbridge.zpm_kinetic_output_hatch": "§cZPM Kinetic Output Hatch", - "kineticbridge.tooltip.capacity": "Provides up to %s SU (~%s EU/t)", - "kineticbridge.tooltip.rpm": "Outputs Create rotation at %s RPM", - "tooltip.kineticbridge.last_tick_power": "Last Tick Draw: %s EU", + "block.kineticbridge.zpm_kinetic_output_hatch_4a": "§cZPM High Kinetic Output Hatch", + "kineticbridge.energy_hatch.output.kinetic": "§bProvides %s SU @ up to %s RPM (~%s EU/t)", + "kineticbridge.energy_hatch.output.tooltip": "Kinetic Energy Output for Multiblocks", "tooltip.kineticbridge.max_power": "Max Output: %s EU/t", "tooltip.kineticbridge.max_stress": "Active Capacity: %s SU @ %s RPM" } \ No newline at end of file diff --git a/src/generated/resources/assets/kineticbridge/models/block/machine/ev_kinetic_output_hatch_4a.json b/src/generated/resources/assets/kineticbridge/models/block/machine/ev_kinetic_output_hatch_4a.json new file mode 100644 index 0000000..5d5c303 --- /dev/null +++ b/src/generated/resources/assets/kineticbridge/models/block/machine/ev_kinetic_output_hatch_4a.json @@ -0,0 +1,22 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "kineticbridge:ev_kinetic_output_hatch_4a", + "replaceable_textures": [ + "bottom", + "top", + "side" + ], + "variants": { + "": { + "model": { + "parent": "kineticbridge:block/machine/part/kinetic_output_hatch_4a_overlay", + "textures": { + "bottom": "gtceu:block/casings/voltage/ev/bottom", + "side": "gtceu:block/casings/voltage/ev/side", + "top": "gtceu:block/casings/voltage/ev/top" + } + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/kineticbridge/models/block/machine/iv_kinetic_output_hatch_4a.json b/src/generated/resources/assets/kineticbridge/models/block/machine/iv_kinetic_output_hatch_4a.json new file mode 100644 index 0000000..8cab331 --- /dev/null +++ b/src/generated/resources/assets/kineticbridge/models/block/machine/iv_kinetic_output_hatch_4a.json @@ -0,0 +1,22 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "kineticbridge:iv_kinetic_output_hatch_4a", + "replaceable_textures": [ + "bottom", + "top", + "side" + ], + "variants": { + "": { + "model": { + "parent": "kineticbridge:block/machine/part/kinetic_output_hatch_4a_overlay", + "textures": { + "bottom": "gtceu:block/casings/voltage/iv/bottom", + "side": "gtceu:block/casings/voltage/iv/side", + "top": "gtceu:block/casings/voltage/iv/top" + } + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/kineticbridge/models/block/machine/luv_kinetic_output_hatch_4a.json b/src/generated/resources/assets/kineticbridge/models/block/machine/luv_kinetic_output_hatch_4a.json new file mode 100644 index 0000000..f8bc7c9 --- /dev/null +++ b/src/generated/resources/assets/kineticbridge/models/block/machine/luv_kinetic_output_hatch_4a.json @@ -0,0 +1,22 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "kineticbridge:luv_kinetic_output_hatch_4a", + "replaceable_textures": [ + "bottom", + "top", + "side" + ], + "variants": { + "": { + "model": { + "parent": "kineticbridge:block/machine/part/kinetic_output_hatch_4a_overlay", + "textures": { + "bottom": "gtceu:block/casings/voltage/luv/bottom", + "side": "gtceu:block/casings/voltage/luv/side", + "top": "gtceu:block/casings/voltage/luv/top" + } + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/kineticbridge/models/block/machine/max_kinetic_output_hatch_4a.json b/src/generated/resources/assets/kineticbridge/models/block/machine/max_kinetic_output_hatch_4a.json new file mode 100644 index 0000000..a0f12e7 --- /dev/null +++ b/src/generated/resources/assets/kineticbridge/models/block/machine/max_kinetic_output_hatch_4a.json @@ -0,0 +1,22 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "kineticbridge:max_kinetic_output_hatch_4a", + "replaceable_textures": [ + "bottom", + "top", + "side" + ], + "variants": { + "": { + "model": { + "parent": "kineticbridge:block/machine/part/kinetic_output_hatch_4a_overlay", + "textures": { + "bottom": "gtceu:block/casings/voltage/max/bottom", + "side": "gtceu:block/casings/voltage/max/side", + "top": "gtceu:block/casings/voltage/max/top" + } + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/kineticbridge/models/block/machine/opv_kinetic_output_hatch_4a.json b/src/generated/resources/assets/kineticbridge/models/block/machine/opv_kinetic_output_hatch_4a.json new file mode 100644 index 0000000..cec85c6 --- /dev/null +++ b/src/generated/resources/assets/kineticbridge/models/block/machine/opv_kinetic_output_hatch_4a.json @@ -0,0 +1,22 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "kineticbridge:opv_kinetic_output_hatch_4a", + "replaceable_textures": [ + "bottom", + "top", + "side" + ], + "variants": { + "": { + "model": { + "parent": "kineticbridge:block/machine/part/kinetic_output_hatch_4a_overlay", + "textures": { + "bottom": "gtceu:block/casings/voltage/opv/bottom", + "side": "gtceu:block/casings/voltage/opv/side", + "top": "gtceu:block/casings/voltage/opv/top" + } + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/kineticbridge/models/block/machine/uev_kinetic_output_hatch_4a.json b/src/generated/resources/assets/kineticbridge/models/block/machine/uev_kinetic_output_hatch_4a.json new file mode 100644 index 0000000..30f4e1d --- /dev/null +++ b/src/generated/resources/assets/kineticbridge/models/block/machine/uev_kinetic_output_hatch_4a.json @@ -0,0 +1,22 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "kineticbridge:uev_kinetic_output_hatch_4a", + "replaceable_textures": [ + "bottom", + "top", + "side" + ], + "variants": { + "": { + "model": { + "parent": "kineticbridge:block/machine/part/kinetic_output_hatch_4a_overlay", + "textures": { + "bottom": "gtceu:block/casings/voltage/uev/bottom", + "side": "gtceu:block/casings/voltage/uev/side", + "top": "gtceu:block/casings/voltage/uev/top" + } + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/kineticbridge/models/block/machine/uhv_kinetic_output_hatch_4a.json b/src/generated/resources/assets/kineticbridge/models/block/machine/uhv_kinetic_output_hatch_4a.json new file mode 100644 index 0000000..e8bf97d --- /dev/null +++ b/src/generated/resources/assets/kineticbridge/models/block/machine/uhv_kinetic_output_hatch_4a.json @@ -0,0 +1,22 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "kineticbridge:uhv_kinetic_output_hatch_4a", + "replaceable_textures": [ + "bottom", + "top", + "side" + ], + "variants": { + "": { + "model": { + "parent": "kineticbridge:block/machine/part/kinetic_output_hatch_4a_overlay", + "textures": { + "bottom": "gtceu:block/casings/voltage/uhv/bottom", + "side": "gtceu:block/casings/voltage/uhv/side", + "top": "gtceu:block/casings/voltage/uhv/top" + } + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/kineticbridge/models/block/machine/uiv_kinetic_output_hatch_4a.json b/src/generated/resources/assets/kineticbridge/models/block/machine/uiv_kinetic_output_hatch_4a.json new file mode 100644 index 0000000..6bbcb29 --- /dev/null +++ b/src/generated/resources/assets/kineticbridge/models/block/machine/uiv_kinetic_output_hatch_4a.json @@ -0,0 +1,22 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "kineticbridge:uiv_kinetic_output_hatch_4a", + "replaceable_textures": [ + "bottom", + "top", + "side" + ], + "variants": { + "": { + "model": { + "parent": "kineticbridge:block/machine/part/kinetic_output_hatch_4a_overlay", + "textures": { + "bottom": "gtceu:block/casings/voltage/uiv/bottom", + "side": "gtceu:block/casings/voltage/uiv/side", + "top": "gtceu:block/casings/voltage/uiv/top" + } + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/kineticbridge/models/block/machine/uv_kinetic_output_hatch_4a.json b/src/generated/resources/assets/kineticbridge/models/block/machine/uv_kinetic_output_hatch_4a.json new file mode 100644 index 0000000..c6f9325 --- /dev/null +++ b/src/generated/resources/assets/kineticbridge/models/block/machine/uv_kinetic_output_hatch_4a.json @@ -0,0 +1,22 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "kineticbridge:uv_kinetic_output_hatch_4a", + "replaceable_textures": [ + "bottom", + "top", + "side" + ], + "variants": { + "": { + "model": { + "parent": "kineticbridge:block/machine/part/kinetic_output_hatch_4a_overlay", + "textures": { + "bottom": "gtceu:block/casings/voltage/uv/bottom", + "side": "gtceu:block/casings/voltage/uv/side", + "top": "gtceu:block/casings/voltage/uv/top" + } + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/kineticbridge/models/block/machine/uxv_kinetic_output_hatch_4a.json b/src/generated/resources/assets/kineticbridge/models/block/machine/uxv_kinetic_output_hatch_4a.json new file mode 100644 index 0000000..079b3d8 --- /dev/null +++ b/src/generated/resources/assets/kineticbridge/models/block/machine/uxv_kinetic_output_hatch_4a.json @@ -0,0 +1,22 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "kineticbridge:uxv_kinetic_output_hatch_4a", + "replaceable_textures": [ + "bottom", + "top", + "side" + ], + "variants": { + "": { + "model": { + "parent": "kineticbridge:block/machine/part/kinetic_output_hatch_4a_overlay", + "textures": { + "bottom": "gtceu:block/casings/voltage/uxv/bottom", + "side": "gtceu:block/casings/voltage/uxv/side", + "top": "gtceu:block/casings/voltage/uxv/top" + } + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/kineticbridge/models/block/machine/zpm_kinetic_output_hatch_4a.json b/src/generated/resources/assets/kineticbridge/models/block/machine/zpm_kinetic_output_hatch_4a.json new file mode 100644 index 0000000..81a5151 --- /dev/null +++ b/src/generated/resources/assets/kineticbridge/models/block/machine/zpm_kinetic_output_hatch_4a.json @@ -0,0 +1,22 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "kineticbridge:zpm_kinetic_output_hatch_4a", + "replaceable_textures": [ + "bottom", + "top", + "side" + ], + "variants": { + "": { + "model": { + "parent": "kineticbridge:block/machine/part/kinetic_output_hatch_4a_overlay", + "textures": { + "bottom": "gtceu:block/casings/voltage/zpm/bottom", + "side": "gtceu:block/casings/voltage/zpm/side", + "top": "gtceu:block/casings/voltage/zpm/top" + } + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/kineticbridge/models/item/ev_kinetic_output_hatch_4a.json b/src/generated/resources/assets/kineticbridge/models/item/ev_kinetic_output_hatch_4a.json new file mode 100644 index 0000000..39968f1 --- /dev/null +++ b/src/generated/resources/assets/kineticbridge/models/item/ev_kinetic_output_hatch_4a.json @@ -0,0 +1,3 @@ +{ + "parent": "kineticbridge:block/machine/ev_kinetic_output_hatch_4a" +} \ No newline at end of file diff --git a/src/generated/resources/assets/kineticbridge/models/item/iv_kinetic_output_hatch_4a.json b/src/generated/resources/assets/kineticbridge/models/item/iv_kinetic_output_hatch_4a.json new file mode 100644 index 0000000..5ae46fa --- /dev/null +++ b/src/generated/resources/assets/kineticbridge/models/item/iv_kinetic_output_hatch_4a.json @@ -0,0 +1,3 @@ +{ + "parent": "kineticbridge:block/machine/iv_kinetic_output_hatch_4a" +} \ No newline at end of file diff --git a/src/generated/resources/assets/kineticbridge/models/item/luv_kinetic_output_hatch_4a.json b/src/generated/resources/assets/kineticbridge/models/item/luv_kinetic_output_hatch_4a.json new file mode 100644 index 0000000..7ed453b --- /dev/null +++ b/src/generated/resources/assets/kineticbridge/models/item/luv_kinetic_output_hatch_4a.json @@ -0,0 +1,3 @@ +{ + "parent": "kineticbridge:block/machine/luv_kinetic_output_hatch_4a" +} \ No newline at end of file diff --git a/src/generated/resources/assets/kineticbridge/models/item/max_kinetic_output_hatch_4a.json b/src/generated/resources/assets/kineticbridge/models/item/max_kinetic_output_hatch_4a.json new file mode 100644 index 0000000..29c920c --- /dev/null +++ b/src/generated/resources/assets/kineticbridge/models/item/max_kinetic_output_hatch_4a.json @@ -0,0 +1,3 @@ +{ + "parent": "kineticbridge:block/machine/max_kinetic_output_hatch_4a" +} \ No newline at end of file diff --git a/src/generated/resources/assets/kineticbridge/models/item/opv_kinetic_output_hatch_4a.json b/src/generated/resources/assets/kineticbridge/models/item/opv_kinetic_output_hatch_4a.json new file mode 100644 index 0000000..9d80216 --- /dev/null +++ b/src/generated/resources/assets/kineticbridge/models/item/opv_kinetic_output_hatch_4a.json @@ -0,0 +1,3 @@ +{ + "parent": "kineticbridge:block/machine/opv_kinetic_output_hatch_4a" +} \ No newline at end of file diff --git a/src/generated/resources/assets/kineticbridge/models/item/uev_kinetic_output_hatch_4a.json b/src/generated/resources/assets/kineticbridge/models/item/uev_kinetic_output_hatch_4a.json new file mode 100644 index 0000000..6c2b364 --- /dev/null +++ b/src/generated/resources/assets/kineticbridge/models/item/uev_kinetic_output_hatch_4a.json @@ -0,0 +1,3 @@ +{ + "parent": "kineticbridge:block/machine/uev_kinetic_output_hatch_4a" +} \ No newline at end of file diff --git a/src/generated/resources/assets/kineticbridge/models/item/uhv_kinetic_output_hatch_4a.json b/src/generated/resources/assets/kineticbridge/models/item/uhv_kinetic_output_hatch_4a.json new file mode 100644 index 0000000..dcd25bb --- /dev/null +++ b/src/generated/resources/assets/kineticbridge/models/item/uhv_kinetic_output_hatch_4a.json @@ -0,0 +1,3 @@ +{ + "parent": "kineticbridge:block/machine/uhv_kinetic_output_hatch_4a" +} \ No newline at end of file diff --git a/src/generated/resources/assets/kineticbridge/models/item/uiv_kinetic_output_hatch_4a.json b/src/generated/resources/assets/kineticbridge/models/item/uiv_kinetic_output_hatch_4a.json new file mode 100644 index 0000000..fbb172b --- /dev/null +++ b/src/generated/resources/assets/kineticbridge/models/item/uiv_kinetic_output_hatch_4a.json @@ -0,0 +1,3 @@ +{ + "parent": "kineticbridge:block/machine/uiv_kinetic_output_hatch_4a" +} \ No newline at end of file diff --git a/src/generated/resources/assets/kineticbridge/models/item/uv_kinetic_output_hatch_4a.json b/src/generated/resources/assets/kineticbridge/models/item/uv_kinetic_output_hatch_4a.json new file mode 100644 index 0000000..1b1528f --- /dev/null +++ b/src/generated/resources/assets/kineticbridge/models/item/uv_kinetic_output_hatch_4a.json @@ -0,0 +1,3 @@ +{ + "parent": "kineticbridge:block/machine/uv_kinetic_output_hatch_4a" +} \ No newline at end of file diff --git a/src/generated/resources/assets/kineticbridge/models/item/uxv_kinetic_output_hatch_4a.json b/src/generated/resources/assets/kineticbridge/models/item/uxv_kinetic_output_hatch_4a.json new file mode 100644 index 0000000..b48186d --- /dev/null +++ b/src/generated/resources/assets/kineticbridge/models/item/uxv_kinetic_output_hatch_4a.json @@ -0,0 +1,3 @@ +{ + "parent": "kineticbridge:block/machine/uxv_kinetic_output_hatch_4a" +} \ No newline at end of file diff --git a/src/generated/resources/assets/kineticbridge/models/item/zpm_kinetic_output_hatch_4a.json b/src/generated/resources/assets/kineticbridge/models/item/zpm_kinetic_output_hatch_4a.json new file mode 100644 index 0000000..ace0f14 --- /dev/null +++ b/src/generated/resources/assets/kineticbridge/models/item/zpm_kinetic_output_hatch_4a.json @@ -0,0 +1,3 @@ +{ + "parent": "kineticbridge:block/machine/zpm_kinetic_output_hatch_4a" +} \ No newline at end of file diff --git a/src/main/java/com/imbgt/kineticbridge/KineticBridgeMachines.java b/src/main/java/com/imbgt/kineticbridge/KineticBridgeMachines.java index 1404fc9..6d8204d 100644 --- a/src/main/java/com/imbgt/kineticbridge/KineticBridgeMachines.java +++ b/src/main/java/com/imbgt/kineticbridge/KineticBridgeMachines.java @@ -1,7 +1,9 @@ package com.imbgt.kineticbridge; +import com.gregtechceu.gtceu.api.GTCEuAPI; import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.block.IMachineBlock; +import com.gregtechceu.gtceu.api.capability.compat.FeCompat; import com.gregtechceu.gtceu.api.data.RotationState; import com.gregtechceu.gtceu.api.item.MetaMachineItem; import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity; @@ -9,7 +11,6 @@ import com.gregtechceu.gtceu.api.machine.MachineDefinition; import com.gregtechceu.gtceu.api.machine.MetaMachine; import com.gregtechceu.gtceu.api.machine.multiblock.PartAbility; import com.gregtechceu.gtceu.api.registry.registrate.MachineBuilder; -import com.gregtechceu.gtceu.common.machine.multiblock.part.EnergyHatchPartMachine; import com.gregtechceu.gtceu.utils.FormattingUtil; import net.minecraft.network.chat.Component; @@ -27,6 +28,7 @@ public final class KineticBridgeMachines { private KineticBridgeMachines() {} private static final int OUTPUT_AMPERAGE = 2; + private static final int OUTPUT_HIGH_AMPERAGE = 4; public static final MachineDefinition[] KINETIC_OUTPUT_HATCH = registerTieredMachines( "kinetic_output_hatch", @@ -36,24 +38,40 @@ public final class KineticBridgeMachines { .rotationState(RotationState.ALL) .abilities(PartAbility.OUTPUT_ENERGY) .tooltips( - Component.translatable("gtceu.universal.tooltip.voltage_out", - FormattingUtil.formatNumbers(GTValues.V[tier]), GTValues.VNF[tier]), - Component.translatable("gtceu.universal.tooltip.amperage_out", OUTPUT_AMPERAGE), - Component.translatable("gtceu.universal.tooltip.energy_storage_capacity", + Component.translatable("kineticbridge.energy_hatch.output.kinetic", FormattingUtil.formatNumbers( - EnergyHatchPartMachine.getHatchEnergyCapacity(tier, OUTPUT_AMPERAGE))), - Component.translatable("gtceu.machine.energy_hatch.output.tooltip"), - Component.translatable("kineticbridge.tooltip.rpm", - FormattingUtil.formatNumbers(KineticOutputHatchPartMachine.TARGET_RPM)), - Component.translatable("kineticbridge.tooltip.capacity", - FormattingUtil.formatNumbers( - GTValues.V[tier] * OUTPUT_AMPERAGE / - KineticOutputHatchPartMachine.TARGET_RPM), - FormattingUtil.formatNumbers(GTValues.V[tier] * OUTPUT_AMPERAGE))) + GTValues.V[tier] * OUTPUT_AMPERAGE * FeCompat.ratio(false) * + KineticOutputHatchPartMachine.SU_TO_FE), + FormattingUtil.formatNumbers(KineticOutputHatchPartMachine.TARGET_RPM), + FormattingUtil.formatNumbers(GTValues.V[tier] * OUTPUT_AMPERAGE)), + Component.translatable("kineticbridge.energy_hatch.output.tooltip") + + ) .overlayTieredHullModel(KineticBridge.id("block/machine/part/kinetic_output_hatch_overlay")) .register(), GTValues.ALL_TIERS); + public static final MachineDefinition[] KINETIC_OUTPUT_HATCH_4A = registerTieredMachines( + "kinetic_output_hatch_4a", + (holder, tier) -> new KineticOutputHatchPartMachine(holder, tier, OUTPUT_HIGH_AMPERAGE), + (tier, builder) -> builder + .langValue(GTValues.VNF[tier] + " High Kinetic Output Hatch") + .rotationState(RotationState.ALL) + .abilities(PartAbility.OUTPUT_ENERGY) + .tooltips( + Component.translatable("kineticbridge.energy_hatch.output.kinetic", + FormattingUtil.formatNumbers( + GTValues.V[tier] * OUTPUT_HIGH_AMPERAGE * FeCompat.ratio(false) * + KineticOutputHatchPartMachine.SU_TO_FE), + FormattingUtil.formatNumbers(KineticOutputHatchPartMachine.TARGET_RPM), + FormattingUtil.formatNumbers(GTValues.V[tier] * OUTPUT_HIGH_AMPERAGE)), + Component.translatable("kineticbridge.energy_hatch.output.tooltip") + + ) + .overlayTieredHullModel(KineticBridge.id("block/machine/part/kinetic_output_hatch_4a_overlay")) + .register(), + GTValues.tiersBetween(GTValues.EV, GTCEuAPI.isHighTier() ? GTValues.MAX : GTValues.UHV)); + private static MachineDefinition[] registerTieredMachines( String name, BiFunction factory, diff --git a/src/main/java/com/imbgt/kineticbridge/blockentity/KineticOutputHatchBlockEntity.java b/src/main/java/com/imbgt/kineticbridge/blockentity/KineticOutputHatchBlockEntity.java index 91bad29..e4c0d99 100644 --- a/src/main/java/com/imbgt/kineticbridge/blockentity/KineticOutputHatchBlockEntity.java +++ b/src/main/java/com/imbgt/kineticbridge/blockentity/KineticOutputHatchBlockEntity.java @@ -37,27 +37,23 @@ import com.imbgt.kineticbridge.machine.KineticOutputHatchPartMachine; import com.simibubi.create.content.kinetics.KineticNetwork; import com.simibubi.create.content.kinetics.base.GeneratingKineticBlockEntity; import com.simibubi.create.content.kinetics.base.IRotate; - import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.List; import java.util.Set; -import com.imbgt.kineticbridge.KineticBridge; - /** * Block entity that bridges a GTCEu meta machine with Create's kinetic network. */ public class KineticOutputHatchBlockEntity extends GeneratingKineticBlockEntity - implements IMachineBlockEntity, IManaged { + implements IMachineBlockEntity, IManaged { private static final ManagedFieldHolder MANAGED_FIELD_HOLDER = new ManagedFieldHolder( KineticOutputHatchBlockEntity.class); // FE generated per stress unit per RPM tick, aligned with Create: New Age // defaults - private static final double SU_TO_FE = 15.0d / 512.0d; - private static final float EPSILON = 1.0e-4f; + private static final double SU_TO_FE = KineticOutputHatchPartMachine.SU_TO_FE; private static final float TARGET_RPM = KineticOutputHatchPartMachine.TARGET_RPM; private final MultiManagedStorage managedStorage = new MultiManagedStorage(); @@ -123,11 +119,9 @@ public class KineticOutputHatchBlockEntity extends GeneratingKineticBlockEntity return null; } return hatch.getEnergyContainer(); - } private void finalizeKinetics() { - if (Math.abs(this.lastGeneratedSpeed - this.generatedSpeed) >= 1) { updateGeneratedRotation(); this.lastGeneratedSpeed = this.generatedSpeed; @@ -186,8 +180,7 @@ public class KineticOutputHatchBlockEntity extends GeneratingKineticBlockEntity } long euMax = Math.max(0L, ec.getOutputVoltage() * ec.getOutputAmperage()); - double feMax = FeCompat.toFeLong(euMax, FeCompat.ratio(false)); - double suMAx = feMax * SU_TO_FE; + double suMAx = euMax * FeCompat.ratio(false) * SU_TO_FE; return (float) suMAx; } @@ -296,15 +289,15 @@ public class KineticOutputHatchBlockEntity extends GeneratingKineticBlockEntity @Override public boolean shouldRenderGrid(Player player, BlockPos pos, BlockState state, ItemStack held, - Set toolTypes) { + Set toolTypes) { return metaMachine.shouldRenderGrid(player, pos, state, held, toolTypes); } @Override public @Nullable com.lowdragmc.lowdraglib.gui.texture.ResourceTexture sideTips(Player player, BlockPos pos, - BlockState state, - Set toolTypes, - Direction side) { + BlockState state, + Set toolTypes, + Direction side) { return metaMachine.sideTips(player, pos, state, toolTypes, side); } diff --git a/src/main/java/com/imbgt/kineticbridge/datagen/KineticBridgeDatagen.java b/src/main/java/com/imbgt/kineticbridge/datagen/KineticBridgeDatagen.java index 421aeba..f91337a 100644 --- a/src/main/java/com/imbgt/kineticbridge/datagen/KineticBridgeDatagen.java +++ b/src/main/java/com/imbgt/kineticbridge/datagen/KineticBridgeDatagen.java @@ -37,8 +37,8 @@ public final class KineticBridgeDatagen { KineticBridge.REGISTRATE.addDataGenerator(ProviderType.LANG, provider -> { provider.add("tooltip.kineticbridge.max_power", "Max Output: %s EU/t"); provider.add("tooltip.kineticbridge.max_stress", "Active Capacity: %s SU @ %s RPM"); - provider.add("kineticbridge.tooltip.rpm", "Outputs Create rotation at %s RPM"); - provider.add("kineticbridge.tooltip.capacity", "Provides up to %s SU (~%s EU/t)"); + provider.add("kineticbridge.energy_hatch.output.kinetic", "§bProvides up to %s SU @ up to %s RPM (~%s EU/t)"); + provider.add("kineticbridge.energy_hatch.output.tooltip", "Kinetic Energy Output for Multiblocks"); }); var output = event.getGenerator().getPackOutput(); event.getGenerator().addProvider(true, new KineticBridgeMachineModelProvider(output)); diff --git a/src/main/java/com/imbgt/kineticbridge/machine/KineticOutputHatchPartMachine.java b/src/main/java/com/imbgt/kineticbridge/machine/KineticOutputHatchPartMachine.java index 05aa135..c154e46 100644 --- a/src/main/java/com/imbgt/kineticbridge/machine/KineticOutputHatchPartMachine.java +++ b/src/main/java/com/imbgt/kineticbridge/machine/KineticOutputHatchPartMachine.java @@ -7,6 +7,7 @@ import com.gregtechceu.gtceu.common.machine.multiblock.part.EnergyHatchPartMachi public class KineticOutputHatchPartMachine extends EnergyHatchPartMachine { + public static final double SU_TO_FE = 15.0d / 512.0d; public static final float TARGET_RPM = 256.0f; public KineticOutputHatchPartMachine(IMachineBlockEntity holder, int tier, int amperage) { diff --git a/src/main/resources/assets/kineticbridge/models/block/machine/part/kinetic_output_hatch_4a_overlay.json b/src/main/resources/assets/kineticbridge/models/block/machine/part/kinetic_output_hatch_4a_overlay.json new file mode 100644 index 0000000..8378e43 --- /dev/null +++ b/src/main/resources/assets/kineticbridge/models/block/machine/part/kinetic_output_hatch_4a_overlay.json @@ -0,0 +1,3 @@ +{ + "parent": "gtceu:block/machine/part/energy_output_hatch_4a" +}