Merge branch '1.21' into l10n_1.21

Rearth · Dec 5, 2024 · 495974d · 495974d
2 parents 0479507 + ca1def2
commit 495974d
Show file tree

Hide file tree

Showing 39 changed files with 887 additions and 694 deletions.
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
@@ -0,0 +1,8 @@
+- Add JEI integration for recipes
+- Add tags for storage blocks, storage_blocks/MATERIAL, ingot/MATERIAL, dust/MATERIAL, gems, gems/MATERIAL
+- Add missing images to online docs (with some minor improvements)
+- Add extra tooltip to fuel generator item regarding energy output positions
+- Add missing tag translations (only used in EMI I think)
+- Add new unholy intelligence texture
+- Fix item wrench recipe not using item tags
+- Fix all dye recipes resulting in white dye
diff --git a/README.md b/README.md
@@ -50,17 +50,13 @@ Currently in very early access, numerous bugs and issues are to be expected.
 
 If you want to contribute, suggest ideas or just see what's planned, make sure to check out the GitHub discussions for this project (https://github.com/Rearth/Oritech/discussions).
 
-Includes REI and EMI compatibility.
+Includes JEI, REI and EMI compatibility. Works best with EMI.
 
-[//]: # (Extra mod compatibilities &#40;allowing metals and other components to be processed in Oritech machines, and vice-versa&#41; for the following mode are included:)
-
-[//]: # (- Alloy Forgery)
-
-[//]: # (- Tech Reborn)
-
-[//]: # (- Energized Power)
-
-[//]: # (- Mythic Metals)
+Extra mod compatibilities (allowing metals and other components to be processed in Oritech machines, and vice-versa) for the following mode are included:
+- Alloy Forgery
+- Tech Reborn
+- Energized Power
+- Mythic Metals
 
 The following translations are available:
 - English
@@ -71,6 +67,7 @@ The following translations are available:
 - Spanish (by Seyronh)
 - Turkish (by RuyaSavascisi)
 - French (by kikipunk)
+- German (by Wolkensteinchen)
 - Polish (by plhappylemonpl & Przemol)
 
 ## Built With
@@ -139,9 +136,10 @@ In detail, these are the following items that are from the above-mentioned sourc
 * glisco, the creator of owo-lib, for creating this awesome library and supporting in its usage
 * unilock, for providing most of the work on the EMI integration
 * The creators and maintainers of Geckolib for creating the great animation engine, and helping out in their discord
-* [LyFl0w's texture maker](https://github.com/LyFl0w/TextureMaker), which has been used for a lot of the other mod textures
+* [LyFl0w's texture maker](https://github.com/LyFl0w/TextureMaker), which has been used for item textures. Around 10 textures made with it are still in use.
 * Ycar, for creating all tiers of the machine core textures
-* BBoldt and BLOKBUSTR, for fixing a series of issues with the textures, and generally improving and redesigning almost all the metal component textures
+* BBoldt and BLOKBUSTR, for providing most of the metal item variant textures
 * jshipley, for a lot of contributions with new features, block, mechanics and bugfixes
 * CrazyMiner34, for improvements to item rendering in 3rd person & the wrench texture
 * NovaKatt, for creating most of the metal / compacted block textures
+* Armen, for making the pipes configurable with the wrench and some more improvements
diff --git a/common/build.gradle b/common/build.gradle
@@ -24,7 +24,7 @@ dependencies {
     modImplementation "software.bernie.geckolib:geckolib-fabric-1.21.1:4.6.6"
 
     // EMI
-    modCompileOnly "dev.emi:emi-xplat-intermediary:1.1.12+1.21:api"
+    modCompileOnly "dev.emi:emi-xplat-intermediary:${emi_version}:api"
 
     // REI
     modCompileOnly "me.shedaniel:RoughlyEnoughItems-api:16.0.754"

diff --git a/common/src/main/generated/assets/oritech/blockstates/reactor_controller.json b/common/src/main/generated/assets/oritech/blockstates/reactor_controller.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "minecraft:block/iron_block"
+    }
+  }
+}
diff --git a/common/src/main/generated/assets/oritech/blockstates/reactor_double_rod.json b/common/src/main/generated/assets/oritech/blockstates/reactor_double_rod.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "minecraft:block/iron_block"
+    }
+  }
+}
diff --git a/common/src/main/generated/assets/oritech/blockstates/reactor_heat_pipe.json b/common/src/main/generated/assets/oritech/blockstates/reactor_heat_pipe.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "minecraft:block/iron_block"
+    }
+  }
+}
diff --git a/common/src/main/generated/assets/oritech/blockstates/reactor_quad_rod.json b/common/src/main/generated/assets/oritech/blockstates/reactor_quad_rod.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "minecraft:block/iron_block"
+    }
+  }
+}
diff --git a/common/src/main/generated/assets/oritech/blockstates/reactor_reflector.json b/common/src/main/generated/assets/oritech/blockstates/reactor_reflector.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "minecraft:block/iron_block"
+    }
+  }
+}
diff --git a/common/src/main/generated/assets/oritech/blockstates/reactor_rod.json b/common/src/main/generated/assets/oritech/blockstates/reactor_rod.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "minecraft:block/iron_block"
+    }
+  }
+}
diff --git a/common/src/main/generated/assets/oritech/blockstates/reactor_vent.json b/common/src/main/generated/assets/oritech/blockstates/reactor_vent.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "minecraft:block/iron_block"
+    }
+  }
+}
diff --git a/common/src/main/generated/assets/oritech/blockstates/reactor_wall.json b/common/src/main/generated/assets/oritech/blockstates/reactor_wall.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "minecraft:block/iron_block"
+    }
+  }
+}
diff --git a/common/src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json b/common/src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json
@@ -1,100 +1,100 @@
 {
   "values": [
-    "oritech:machine_efficiency_addon",
-    "oritech:item_pipe",
-    "oritech:machine_plating_block",
-    "oritech:electrum_block",
-    "oritech:atomic_forge_block",
-    "oritech:energite_block",
-    "oritech:laser_arm_block",
-    "oritech:basic_generator_block",
-    "oritech:fertilizer_block",
+    "oritech:spawner_controller_block",
+    "oritech:accelerator_controller",
+    "oritech:duratium_block",
     "oritech:silicon_block",
-    "oritech:machine_speed_addon",
-    "oritech:machine_core_2",
-    "oritech:pulverizer_block",
-    "oritech:adamant_block",
-    "oritech:deep_drill_block",
-    "oritech:machine_yield_addon",
     "oritech:machine_plating_pressure_plate",
-    "oritech:machine_core_3",
-    "oritech:machine_hunter_addon",
+    "oritech:adamant_block",
+    "oritech:item_filter_block",
+    "oritech:machine_core_5",
     "oritech:machine_plating_stairs",
-    "oritech:creative_storage_block",
-    "oritech:machine_redstone_addon",
-    "oritech:machine_acceptor_addon",
-    "oritech:plastic_block",
+    "oritech:basic_generator_block",
+    "oritech:pump_block",
+    "oritech:tech_lever",
+    "oritech:platinum_block",
+    "oritech:steam_boiler_addon",
     "oritech:fluid_pipe",
-    "oritech:pipe_booster_block",
-    "oritech:ceiling_light",
-    "oritech:nickel_plating_pressure_plate",
-    "oritech:duratium_block",
-    "oritech:drone_port_block",
-    "oritech:item_filter_block",
+    "oritech:nickel_plating_block",
+    "oritech:industrial_glass_block",
+    "oritech:machine_plating_slab",
     "oritech:crop_filter_addon",
-    "oritech:ceiling_light_hanging",
-    "oritech:lava_generator_block",
-    "oritech:platinum_block",
     "oritech:raw_platinum_block",
-    "oritech:enchanter_block",
-    "oritech:nickel_plating_slab",
-    "oritech:enchantment_catalyst_block",
-    "oritech:industrial_glass_block",
-    "oritech:pump_block",
-    "oritech:accelerator_controller",
-    "oritech:machine_core_4",
-    "oritech:fuel_generator_block",
-    "oritech:machine_capacitor_addon",
+    "oritech:item_pipe",
     "oritech:steam_engine_block",
-    "oritech:nickel_plating_stairs",
-    "oritech:spawner_cage_block",
+    "oritech:charger_block",
+    "oritech:iron_plating_block",
     "oritech:black_hole_block",
-    "oritech:large_storage_block",
+    "oritech:laser_arm_block",
+    "oritech:machine_core_1",
+    "oritech:machine_extender",
+    "oritech:iron_plating_stairs",
+    "oritech:enchantment_catalyst_block",
     "oritech:metal_beam_block",
-    "oritech:machine_core_7",
-    "oritech:tech_lever",
-    "oritech:iron_plating_pressure_plate",
-    "oritech:machine_core_5",
-    "oritech:nickel_block",
+    "oritech:machine_efficiency_addon",
+    "oritech:spawner_cage_block",
+    "oritech:fertilizer_block",
+    "oritech:foundry_block",
+    "oritech:atomic_forge_block",
+    "oritech:electrum_block",
+    "oritech:superconductor",
+    "oritech:centrifuge_block",
+    "oritech:assembler_block",
+    "oritech:accelerator_motor",
+    "oritech:big_solar_panel_block",
+    "oritech:fuel_generator_block",
+    "oritech:deep_drill_block",
+    "oritech:machine_redstone_addon",
+    "oritech:creative_storage_block",
     "oritech:bio_generator_block",
+    "oritech:destroyer_block",
+    "oritech:tech_door",
+    "oritech:fragment_forge_block",
+    "oritech:machine_yield_addon",
+    "oritech:capacitor_addon_extender",
+    "oritech:machine_inventory_proxy_addon",
+    "oritech:nickel_plating_slab",
+    "oritech:ceiling_light",
     "oritech:machine_fluid_addon",
-    "oritech:biosteel_block",
-    "oritech:foundry_block",
-    "oritech:charger_block",
-    "oritech:spawner_controller_block",
-    "oritech:steel_block",
+    "oritech:machine_plating_block",
+    "oritech:drone_port_block",
+    "oritech:nickel_plating_pressure_plate",
     "oritech:iron_plating_slab",
-    "oritech:iron_plating_stairs",
-    "oritech:fluxite_block",
-    "oritech:quarry_addon",
-    "oritech:machine_extender",
+    "oritech:machine_core_6",
+    "oritech:particle_collector_block",
+    "oritech:powered_furnace_block",
     "oritech:energy_pipe",
+    "oritech:machine_speed_addon",
+    "oritech:pipe_booster_block",
+    "oritech:machine_core_7",
+    "oritech:machine_capacitor_addon",
+    "oritech:steel_block",
+    "oritech:iron_plating_pressure_plate",
+    "oritech:quarry_addon",
+    "oritech:nickel_plating_stairs",
+    "oritech:machine_core_2",
+    "oritech:pulverizer_block",
+    "oritech:fluxite_block",
+    "oritech:tech_button",
+    "oritech:placer_block",
+    "oritech:machine_hunter_addon",
+    "oritech:biosteel_block",
+    "oritech:machine_acceptor_addon",
     "oritech:biomass_block",
+    "oritech:treefeller_block",
+    "oritech:nickel_block",
     "oritech:accelerator_sensor",
-    "oritech:tech_door",
+    "oritech:ceiling_light_hanging",
+    "oritech:lava_generator_block",
+    "oritech:raw_nickel_block",
+    "oritech:machine_core_4",
+    "oritech:enchanter_block",
     "oritech:machine_frame_block",
-    "oritech:nickel_plating_block",
-    "oritech:powered_furnace_block",
-    "oritech:fragment_forge_block",
-    "oritech:superconductor",
-    "oritech:particle_collector_block",
-    "oritech:machine_inventory_proxy_addon",
-    "oritech:machine_core_1",
-    "oritech:destroyer_block",
-    "oritech:machine_plating_slab",
-    "oritech:big_solar_panel_block",
-    "oritech:accelerator_motor",
-    "oritech:centrifuge_block",
-    "oritech:treefeller_block",
-    "oritech:steam_boiler_addon",
-    "oritech:assembler_block",
-    "oritech:placer_block",
+    "oritech:plastic_block",
+    "oritech:energite_block",
+    "oritech:large_storage_block",
     "oritech:accelerator_ring",
-    "oritech:machine_core_6",
-    "oritech:iron_plating_block",
-    "oritech:capacitor_addon_extender",
-    "oritech:tech_button",
-    "oritech:raw_nickel_block",
+    "oritech:machine_core_3",
     "oritech:energy_pipe_connection",
     "oritech:fluid_pipe_connection",
     "oritech:item_pipe_connection",

diff --git a/common/src/main/generated/data/oritech/recipe/crafting/wrench.json b/common/src/main/generated/data/oritech/recipe/crafting/wrench.json
@@ -6,7 +6,7 @@
       "tag": "c:ingots/nickel"
     },
     "b": {
-      "tag": "c:ingots/nickel"
+      "tag": "c:ingots/steel"
     }
   },
   "pattern": [

diff --git a/common/src/main/java/rearth/oritech/block/entity/interaction/PumpBlockEntity.java b/common/src/main/java/rearth/oritech/block/entity/interaction/PumpBlockEntity.java
@@ -207,7 +207,7 @@ private void progressStartup() {
         // if liquid is water, consider as infinite
         // if liquid, start flood fill to find all liquid blocks. Add all found blocks to queue so that it can be soaked up in reverse
         // search all neighbors per tick
-        // if more than 10000 blocks are found, consider as infinite and stop search
+        // if more than N blocks are found, consider the search finished
         // mark startup as completed
 
         if (toolheadPosition == null) {

diff --git a/common/src/main/java/rearth/oritech/client/ui/BasicMachineScreenHandler.java b/common/src/main/java/rearth/oritech/client/ui/BasicMachineScreenHandler.java
@@ -37,7 +37,7 @@ public class BasicMachineScreenHandler extends ScreenHandler {
     protected final BlockPos blockPos;
 
     @NotNull
-    protected final ScreenProvider screenData;
+    public final ScreenProvider screenData;
 
     @Nullable
     protected final SingleVariantStorage<FluidVariant> steamStorage;
@@ -48,7 +48,7 @@ public class BasicMachineScreenHandler extends ScreenHandler {
     protected final FluidProvider fluidProvider;
 
     protected BlockState machineBlock;
-    protected BlockEntity blockEntity;
+    public BlockEntity blockEntity;
     protected List<Integer> armorSlots;
 
     public BasicMachineScreenHandler(int syncId, PlayerInventory inventory, ModScreens.BasicData setupData) {