Skip to content

Commit

Permalink
Fix crashes when opening the manual
Browse files Browse the repository at this point in the history
  • Loading branch information
@malte0811
malte0811 committed Sep 16, 2024
1 parent bf4b471 commit 4662c78
Show file tree
Hide file tree
Showing 25 changed files with 202 additions and 212 deletions.
7 changes: 4 additions & 3 deletions src/main/java/blusunrize/immersiveengineering/client/manual/IEManualInstance.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import net.minecraft.client.gui.Font;
import net.minecraft.client.resources.language.I18n;
import net.minecraft.resources.ResourceLocation;
import net.neoforged.neoforge.common.ModConfigSpec.ConfigValue;
import net.neoforged.neoforge.network.PacketDistributor;

import java.util.ArrayList;
Expand Down Expand Up @@ -63,10 +64,10 @@ else if("machines.wireConnectorInput".equals(s))
);
// TODO is this right?
UnmodifiableConfig actualCfg = IEServerConfig.CONFIG_SPEC.getValues();
if(!actualCfg.contains(s))
return null;
if(actualCfg.get(s) instanceof ConfigValue<?> value)
return value.get();
else
return actualCfg.get(s);
return null;
});
/*
TODO no longer easily possible?
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/assets/immersiveengineering/manual/alloy_kiln.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@
{
"x": 24,
"y": 0,
"item": "minecraft:glass",
"id": "minecraft:glass",
"count": 2
},
{
"x": 42,
"y": 0,
"item": "immersiveengineering:dust_iron"
"id": "immersiveengineering:dust_iron"
},
{
"x": 78,
"y": 0,
"item": "immersiveengineering:insulating_glass",
"id": "immersiveengineering:insulating_glass",
"count": 2
}
]
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/assets/immersiveengineering/manual/basic_metal_products.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
{
"x": 24,
"y": 0,
"item": "minecraft:iron_ingot"
"id": "minecraft:iron_ingot"
},
{
"x": 42,
"y": 0,
"item": "immersiveengineering:coal_coke"
"id": "immersiveengineering:coal_coke"
},
{
"x": 78,
"y": 0,
"item": "immersiveengineering:ingot_steel"
"id": "immersiveengineering:ingot_steel"
}
]
]
Expand Down
24 changes: 15 additions & 9 deletions src/main/resources/assets/immersiveengineering/manual/bottling_machine.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,27 @@
"type": "bottling",
"recipes": [
{
"item": "minecraft:potion",
"nbt": {
"Potion": "minecraft:awkward"
"id": "minecraft:potion",
"components": {
"minecraft:potion_contents": {
"potion": "minecraft:awkward"
}
}
},
{
"item": "minecraft:potion",
"nbt": {
"Potion": "minecraft:strength"
"id": "minecraft:potion",
"components": {
"minecraft:potion_contents": {
"potion": "minecraft:strength"
}
}
},
{
"item": "minecraft:potion",
"nbt": {
"Potion": "minecraft:swiftness"
"id": "minecraft:potion",
"components": {
"minecraft:potion_contents": {
"potion": "minecraft:swiftness"
}
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/immersiveengineering/manual/buzzsaw.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"grinding_recipe": {
"type": "bottling",
"recipe": {
"item": "immersiveengineering:grindingdisk"
"id": "immersiveengineering:grindingdisk"
}
},
"tank_recipe": {
Expand Down
8 changes: 4 additions & 4 deletions src/main/resources/assets/immersiveengineering/manual/clinker_brick.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"type": "item_display",
"items": [
{
"item": "immersiveengineering:clinker_brick"
"id": "immersiveengineering:clinker_brick"
}
]
},
Expand All @@ -22,13 +22,13 @@
"type": "item_display",
"items": [
{
"item": "immersiveengineering:stairs_clinker_brick"
"id": "immersiveengineering:stairs_clinker_brick"
},
{
"item": "immersiveengineering:wall_clinker_brick"
"id": "immersiveengineering:wall_clinker_brick"
},
{
"item": "immersiveengineering:slab_clinker_brick"
"id": "immersiveengineering:slab_clinker_brick"
}
]
}
Expand Down
8 changes: 4 additions & 4 deletions src/main/resources/assets/immersiveengineering/manual/coke_and_graphite.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@
"type": "item_display",
"items": [
{
"item": "immersiveengineering:coal_coke"
"id": "immersiveengineering:coal_coke"
},
{
"item": "immersiveengineering:dust_coke"
"id": "immersiveengineering:dust_coke"
}
]
},
"graphite": {
"type": "item_display",
"items": [
{
"item": "immersiveengineering:dust_hop_graphite"
"id": "immersiveengineering:dust_hop_graphite"
},
{
"item": "immersiveengineering:ingot_hop_graphite"
"id": "immersiveengineering:ingot_hop_graphite"
}
]
},
Expand Down
18 changes: 9 additions & 9 deletions src/main/resources/assets/immersiveengineering/manual/concrete.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,36 +16,36 @@
"type": "item_display",
"items": [
{
"item": "immersiveengineering:concrete_brick"
"id": "immersiveengineering:concrete_brick"
},
{
"item": "immersiveengineering:concrete_brick_cracked"
"id": "immersiveengineering:concrete_brick_cracked"
},
{
"item": "immersiveengineering:concrete_pillar"
"id": "immersiveengineering:concrete_pillar"
},
{
"item": "immersiveengineering:concrete_chiseled"
"id": "immersiveengineering:concrete_chiseled"
}
]
},
"partial": {
"type": "item_display",
"items": [
{
"item": "immersiveengineering:concrete_sheet"
"id": "immersiveengineering:concrete_sheet"
},
{
"item": "immersiveengineering:concrete_quarter"
"id": "immersiveengineering:concrete_quarter"
},
{
"item": "immersiveengineering:slab_concrete"
"id": "immersiveengineering:slab_concrete"
},
{
"item": "immersiveengineering:concrete_three_quarter"
"id": "immersiveengineering:concrete_three_quarter"
},
{
"item": "immersiveengineering:concrete_tile"
"id": "immersiveengineering:concrete_tile"
}
]
},
Expand Down
78 changes: 48 additions & 30 deletions src/main/resources/assets/immersiveengineering/manual/ear_defenders.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,23 @@
{
"x": 24,
"y": 0,
"item": "immersiveengineering:earmuffs"
"id": "immersiveengineering:earmuffs"
},
{
"x": 42,
"y": 0,
"stacks": [
{
"item": "minecraft:white_dye"
"id": "minecraft:white_dye"
},
{
"item": "minecraft:red_dye"
"id": "minecraft:red_dye"
},
{
"item": "minecraft:green_dye"
"id": "minecraft:green_dye"
},
{
"item": "minecraft:blue_dye"
"id": "minecraft:blue_dye"
}
]
},
Expand All @@ -36,27 +36,47 @@
"y": 0,
"stacks": [
{
"item": "immersiveengineering:earmuffs",
"nbt": {
"IE:EarmuffColour": 16383998
"id": "immersiveengineering:earmuffs",
"components": {
"immersiveengineering:color": {
"a": 1,
"r": 0.9764705882352941,
"g": 1.0,
"b": 0.996078431372549
}
}
},
{
"item": "immersiveengineering:earmuffs",
"nbt": {
"IE:EarmuffColour": 11546150
"id": "immersiveengineering:earmuffs",
"components": {
"immersiveengineering:color": {
"a": 1,
"r": 0.6901960784313725,
"g": 0.1803921568627451,
"b": 0.14901960784313725
}
}
},
{
"item": "immersiveengineering:earmuffs",
"nbt": {
"IE:EarmuffColour": 6192150
"id": "immersiveengineering:earmuffs",
"components": {
"immersiveengineering:color": {
"a": 1,
"r": 0.3686274509803922,
"g": 0.48627450980392156,
"b": 0.08627450980392157
}
}
},
{
"item": "immersiveengineering:earmuffs",
"nbt": {
"IE:EarmuffColour": 8606770
"id": "immersiveengineering:earmuffs",
"components": {
"immersiveengineering:color": {
"a": 1,
"r": 0.5137254901960784,
"g": 0.32941176470588235,
"b": 0.19607843137254902
}
}
}
]
Expand All @@ -66,7 +86,7 @@
[
[
{
"item": "immersiveengineering:earmuffs",
"id": "immersiveengineering:earmuffs",
"x": 24,
"y": 0
},
Expand All @@ -75,10 +95,10 @@
"y": 0,
"stacks": [
{
"item": "minecraft:leather_helmet"
"id": "minecraft:leather_helmet"
},
{
"item": "minecraft:iron_helmet"
"id": "minecraft:iron_helmet"
}
]
},
Expand All @@ -87,20 +107,18 @@
"y": 0,
"stacks": [
{
"item": "minecraft:leather_helmet",
"nbt": {
"IE:Earmuffs": {
"id": "immersiveengineering:earmuffs",
"Count": 1
"id": "minecraft:leather_helmet",
"components": {
"immersiveengineering:contained_earmuff": {
"id": "immersiveengineering:earmuffs"
}
}
},
{
"item": "minecraft:iron_helmet",
"nbt": {
"IE:Earmuffs": {
"id": "immersiveengineering:earmuffs",
"Count": 1
"id": "minecraft:iron_helmet",
"components": {
"immersiveengineering:contained_earmuff": {
"id": "immersiveengineering:earmuffs"
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/assets/immersiveengineering/manual/industrial_byproducts.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@
"type": "item_display",
"items": [
{
"item": "immersiveengineering:dust_sulfur"
"id": "immersiveengineering:dust_sulfur"
}
]
},
"nitrate": {
"type": "item_display",
"items": [
{
"item": "immersiveengineering:dust_saltpeter"
"id": "immersiveengineering:dust_saltpeter"
}
]
},
"slag": {
"type": "item_display",
"items": [
{
"item": "immersiveengineering:slag"
"id": "immersiveengineering:slag"
}
]
},
Expand Down
Loading

0 comments on commit 4662c78

Please sign in to comment.