Skip to content

Tiny Wind Turbine Fix and GUI Icon and TItle Fixes #239

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
ParisGR123 wants to merge 8 commits into
base: dev
Choose a base branch
from
Open

Tiny Wind Turbine Fix and GUI Icon and TItle Fixes #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f3bcf4c
Fixed wind turbine crashing the game. Fixed Wind Turbine not destroyi…
ParisGR123 Mar 19, 2026
f863dc6
Basic DC Motor Title and Icon,
ParisGR123 Mar 20, 2026
a4c37a7
Iron_Tank Name and Icon
ParisGR123 Mar 20, 2026
44f36e9
Autoclave Icon
ParisGR123 Mar 20, 2026
d0c8ce0
Change Inventory Model Display Settings
ParisGR123 Mar 20, 2026
6b0c5d2
Autoclave GUI Fix (typo)
ParisGR123 Mar 21, 2026
cb3ed0c
Coal coke texture and gui image
ParisGR123 Mar 21, 2026
b7e2fac
Diode Title and Image along with model display settings
ParisGR123 Mar 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/main/kotlin/org/eln2/mc/common/content/Wind.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ object WindSystem {
maxOf(
volumeOfInfluence.width,
volumeOfInfluence.height,
volumeOfInfluence.depth)
volumeOfInfluence.depth) + 1.0
)
).toInt()
)
Expand Down Expand Up @@ -816,6 +816,12 @@ class WindTurbineBlockEntity(pos: BlockPos, state: BlockState) :
override val delegateMap: MultiblockDelegateMap
get() = (blockState.block as WindTurbineBlock).delegateMap

override fun setDestroyed() {
// Remove all delegate blocks for this multiblock and restore the world
destroyDelegates() // from BigBlockRepresentativeBlockEntity
super.setDestroyed()
}

override fun setLevel(pLevel: Level) {
super.setLevel(pLevel)

Expand Down
14 changes: 13 additions & 1 deletion src/main/resources/assets/eln2/lang/en_us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@
"block.eln2.kinetic_rolling_machine": "Kinetic Rolling Machine",
"block.eln2.vulcanizing_autoclave": "Autoclave",
"block.eln2.fluid_pipe": "Fluid Pipe",
"block.eln2.primitive_kinetic_crusher": "Primitive Kinetic Crusher",
"block.eln2.brushed_dc_motor_crusher": "Brushed DC Motor Crusher",
"block.eln2.iron_tank": "Iron Tank",

// Wire Parts:
"item.eln2.standard_uninsulated_copper_thermal_wire": "Standard Uninsulated Copper Thermal Conduit",
Expand Down Expand Up @@ -148,6 +151,7 @@
"item.eln2.voltage_source": "Voltage Source",
"item.eln2.ground": "Ground Pin",
"item.eln2.resistor": "Resistor",
"item.eln2.diode": "Diode",
"item.eln2.thermal_radiator": "Thermal Radiator",
"item.eln2.photovoltaic_panel": "Solar Panel",
"item.eln2.light_part": "Wall-Mounted Light",
Expand All @@ -159,7 +163,15 @@
"item.eln2.ground_micro_grid": "Micro Grid Ground",
"item.eln2.micro_grid_dc_to_dc_converter_800w": "800W Micro-Grid Power Converter",
"item.eln2.potential_probe": "Potential Probe",
"item.eln2.basic_two_channel_oscilloscope": "Basic Oscilloscope",
"item.eln2.basic_two_channel_oscilloscope": "Basic 2Ch Oscilloscope",
"item.eln2.basic_single_channel_oscilloscope": "Basic 1Ch Oscilloscope",
"item.eln2.basic_dc_motor": "Basic DC Motor",
"item.eln2.tree_tap": "Tree Tap",

//Kinetics:
"item.eln2.primitive_standard_iron_straight_joint": "Primitive Standard Straight Joint",
"item.eln2.primitive_standard_iron_hub_joint": "Primitive Standard Hub Joint",


// Materials:
"item.eln2.coke": "Coke",
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/eln2/models/block/diode/diode.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"translation": [0, 5.25, 0]
},
"gui": {
"rotation": [28.25, 25, 0],
"rotation": [28.25, 35, 0],
"translation": [0, 6, 0]
},
"fixed": {
Expand Down
167 changes: 167 additions & 0 deletions ...main/resources/assets/eln2/models/block/joint/standard_iron_straight_joint/inventory.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,167 @@
{
"format_version": "1.9.0",
"credit": "Made with Blockbench",
"parent": "iron_bevel_gears",
"texture_size": [64, 64],
"textures": {
"0": "eln2:block/joint/standard_iron/standard_iron_joint",
"particle": "eln2:block/joint/standard_iron/standard_iron_joint"
},
"elements": [
{
"name": "hub_base",
"from": [5, 0, 5],
"to": [11, 1, 11],
"rotation": {"angle": 0, "axis": "y", "origin": [5, 0, 5]},
"faces": {
"north": {"uv": [0, 15, 16, 16], "texture": "#0"},
"east": {"uv": [0, 15, 16, 16], "texture": "#0"},
"south": {"uv": [0, 15, 16, 16], "texture": "#0"},
"west": {"uv": [0, 15, 16, 16], "texture": "#0"},
"up": {"uv": [0, 0, 1.5, 4], "rotation": 90, "texture": "#0"},
"down": {"uv": [0, 0, 1.5, 4], "rotation": 270, "texture": "#0"}
}
},
{
"name": "shaft",
"from": [7.3, 7.3, 0],
"to": [8.7, 8.7, 8],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 3]},
"faces": {
"north": {"uv": [3.75, 2, 6.5, 4.75], "texture": "#0"},
"east": {"uv": [8.75, 0, 16, 15], "rotation": 270, "texture": "#0"},
"south": {"uv": [3.75, 2, 6.5, 4.75], "texture": "#0"},
"west": {"uv": [8.75, 0, 16, 15], "rotation": 270, "texture": "#0"},
"up": {"uv": [8.75, 0, 16, 15], "texture": "#0"},
"down": {"uv": [8.75, 0, 16, 15], "texture": "#0"}
}
},
{
"name": "shaft",
"from": [7.3, 7.3, 8],
"to": [8.7, 8.7, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 11]},
"faces": {
"north": {"uv": [3.75, 2, 6.5, 4.75], "texture": "#0"},
"east": {"uv": [8.75, 0, 16, 15], "rotation": 270, "texture": "#0"},
"south": {"uv": [3.75, 2, 6.5, 4.75], "texture": "#0"},
"west": {"uv": [8.75, 0, 16, 15], "rotation": 270, "texture": "#0"},
"up": {"uv": [8.75, 0, 16, 15], "texture": "#0"},
"down": {"uv": [8.75, 0, 16, 15], "texture": "#0"}
}
},
{
"name": "shaft_wall",
"from": [6, 1, 1],
"to": [10, 10, 2],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 5.5, 1.5]},
"faces": {
"north": {"uv": [1.5, 0, 8.75, 15], "texture": "#0"},
"east": {"uv": [7, 6, 8.5, 9.75], "texture": "#0"},
"south": {"uv": [1.5, 0, 8.75, 15], "texture": "#0"},
"west": {"uv": [4, 6.75, 5.25, 9.75], "texture": "#0"},
"up": {"uv": [3.5, 7.5, 6.5, 9], "texture": "#0"}
}
},
{
"name": "shaft_base",
"from": [5, 0, 0],
"to": [11, 1, 5],
"rotation": {"angle": 0, "axis": "y", "origin": [9, 0, 0]},
"faces": {
"north": {"uv": [0, 4, 1.75, 15], "rotation": 270, "texture": "#0"},
"east": {"uv": [0, 15, 16, 16], "texture": "#0"},
"south": {"uv": [0, 4, 1.75, 15], "rotation": 270, "texture": "#0"},
"west": {"uv": [0, 15, 16, 16], "texture": "#0"},
"up": {"uv": [0, 0, 1.5, 4], "rotation": 90, "texture": "#0"},
"down": {"uv": [0, 0, 1.5, 4], "texture": "#0"}
}
},
{
"name": "shaft_wall",
"from": [6, 1, 14],
"to": [10, 10, 15],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 5.5, 14.5]},
"faces": {
"north": {"uv": [1.5, 0, 8.75, 15], "texture": "#0"},
"east": {"uv": [7, 6, 8.5, 9.75], "texture": "#0"},
"south": {"uv": [1.5, 0, 8.75, 15], "texture": "#0"},
"west": {"uv": [4, 6.75, 5.25, 9.75], "texture": "#0"},
"up": {"uv": [3.5, 7.5, 6.5, 9], "texture": "#0"}
}
},
{
"name": "shaft_base",
"from": [5, 0, 11],
"to": [11, 1, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [9, 0, 11]},
"faces": {
"north": {"uv": [0, 4, 1.75, 15], "rotation": 270, "texture": "#0"},
"east": {"uv": [0, 15, 16, 16], "texture": "#0"},
"south": {"uv": [0, 4, 1.75, 15], "rotation": 270, "texture": "#0"},
"west": {"uv": [0, 15, 16, 16], "texture": "#0"},
"up": {"uv": [0, 0, 1.5, 4], "rotation": 90, "texture": "#0"},
"down": {"uv": [0, 0, 1.5, 4], "texture": "#0"}
}
}
],
"display": {
"thirdperson_righthand": {
"translation": [0, 4, 0],
"scale": [0.5, 0.5, 0.5]
},
"thirdperson_lefthand": {
"translation": [0, 4, 0],
"scale": [0.5, 0.5, 0.5]
},
"ground": {
"translation": [0, 2, 0],
"scale": [0.5, 0.5, 0.5]
},
"gui": {
"rotation": [27.75, 31.75, 0],
"translation": [0, 2.25, 0],
"scale": [0.75, 0.75, 0.75]
},
"fixed": {
"rotation": [0, 90, 0],
"translation": [0, 0, -0.25],
"scale": [0.5, 0.5, 0.5]
},
"on_shelf": {
"rotation": [0, -90, 0]
}
},
"groups": [
{
"name": "body",
"origin": [8, 8, 8],
"color": 0,
"children": [0]
},
{
"name": "shaft",
"origin": [8, 8, 8],
"color": 0,
"children": [1]
},
{
"name": "shaft",
"origin": [8, 8, 8],
"color": 0,
"children": [2]
},
{
"name": "shaft_body",
"origin": [8, 8, 8],
"color": 0,
"children": [3, 4]
},
{
"name": "shaft_body",
"origin": [8, 8, 8],
"color": 0,
"children": [5, 6]
}
]
}
23 changes: 22 additions & 1 deletion src/main/resources/assets/eln2/models/block/tanks/iron_tank.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,26 @@
"down": {"uv": [0, 8, 8, 16], "texture": "#0"}
}
}
]
],
"display": {
"thirdperson_righthand": {
"scale": [0.25, 0.25, 0.25]
},
"thirdperson_lefthand": {
"scale": [0.25, 0.25, 0.25]
},
"firstperson_righthand": {
"scale": [0.25, 0.25, 0.25]
},
"firstperson_lefthand": {
"scale": [0.25, 0.25, 0.25]
},
"ground": {
"scale": [0.25, 0.25, 0.25]
},
"gui": {
"rotation": [30, -45, 0],
"scale": [0.5, 0.5, 0.5]
}
}
}
4 changes: 3 additions & 1 deletion src/main/resources/assets/eln2/models/block/vulcanizing_autoclave/inventory.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1113,7 +1113,7 @@
"scale": [0.25, 0.25, 0.25]
},
"ground": {
"translation": [0, 1.5, 0],
"translation": [0, 1.5, -1.5],
"scale": [0.25, 0.25, 0.25]
},
"gui": {
Expand All @@ -1127,6 +1127,8 @@
"scale": [0.25, 0.25, 0.25]
},
"on_shelf": {
"rotation": [0, 90, 0],
"translation": [-3.5, 0, 0],
"scale": [0.5, 0.5, 0.5]
}
},
Expand Down
3 changes: 3 additions & 0 deletions src/main/resources/assets/eln2/models/item/basic_dc_motor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "eln2:block/motor/basic_dc_motor"
}
3 changes: 3 additions & 0 deletions src/main/resources/assets/eln2/models/item/basic_single_channel_oscilloscope.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "eln2:block/oscilloscopes/flat_oscilloscope_part_single_channel"
}
40 changes: 40 additions & 0 deletions src/main/resources/assets/eln2/models/item/basic_wind_turbine.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"parent": "eln2:block/wind_turbine/basic/inventory",
"display": {
"gui": {
"rotation": [30, 225, 0],
"translation": [-2, -5, 0],
"scale": [0.15, 0.15, 0.15]
},
"ground": {
"rotation": [0, 0, 0],
"translation": [0, 2, 0],
"scale": [0.1, 0.1, 0.1]
},
"fixed": {
"rotation": [0, 180, 0],
"translation": [0, 0, 0],
"scale": [0.12, 0.12, 0.12]
},
"thirdperson_righthand": {
"rotation": [75, 45, 0],
"translation": [0, 2.5, 0],
"scale": [0.1, 0.1, 0.1]
},
"thirdperson_lefthand": {
"rotation": [75, 45, 0],
"translation": [0, 2.5, 0],
"scale": [0.1, 0.1, 0.1]
},
"firstperson_righthand": {
"rotation": [0, 45, 0],
"translation": [0, 0, 0],
"scale": [0.1, 0.1, 0.1]
},
"firstperson_lefthand": {
"rotation": [0, 225, 0],
"translation": [0, 0, 0],
"scale": [0.1, 0.1, 0.1]
}
}
}
6 changes: 6 additions & 0 deletions src/main/resources/assets/eln2/models/item/coke.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "eln2:item/coke"
}
}
3 changes: 3 additions & 0 deletions src/main/resources/assets/eln2/models/item/coke_oven.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "eln2:block/coking_oven/coking_oven"
}
3 changes: 3 additions & 0 deletions src/main/resources/assets/eln2/models/item/diode.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "eln2:block/diode/diode"
}
3 changes: 3 additions & 0 deletions src/main/resources/assets/eln2/models/item/iron_tank.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "eln2:block/tanks/iron_tank"
}
3 changes: 3 additions & 0 deletions src/main/resources/assets/eln2/models/item/primitive_burner.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "eln2:block/primitive_coal_burner/inventory"
}
3 changes: 3 additions & 0 deletions src/main/resources/assets/eln2/models/item/primitive_standard_iron_hub_joint.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "eln2:block/joint/standard_iron_hub_joint/hub"
}
3 changes: 3 additions & 0 deletions src/main/resources/assets/eln2/models/item/primitive_standard_iron_straight_joint.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "eln2:block/joint/standard_iron_straight_joint/inventory"
}
3 changes: 3 additions & 0 deletions src/main/resources/assets/eln2/models/item/tree_tap.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "eln2:block/rubber_tap/rubber_tap"
}
3 changes: 3 additions & 0 deletions src/main/resources/assets/eln2/models/item/vulcanizing_autoclave.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "eln2:block/vulcanizing_autoclave/inventory"
}
Binary file added src/main/resources/assets/eln2/textures/item/coke.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.