Skip to content

Commit

Permalink
Use water tag for oils only on fabric (Fixes #249)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Rearth
Rearth committed Feb 3, 2025
1 parent 89727ab commit 3be219d
Show file tree
Hide file tree
Showing 4 changed files with 107 additions and 128 deletions.
214 changes: 107 additions & 107 deletions common/src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json
View file
Original file line number Diff line number Diff line change
@@ -1,130 +1,130 @@
{
"values": [
"oritech:deep_drill_block",
"oritech:crop_filter_addon",
"oritech:machine_ultimate_addon",
"oritech:machine_redstone_addon",
"oritech:atomic_forge_block",
"oritech:machine_core_5",
"oritech:black_hole_block",
"oritech:drone_port_block",
"oritech:accelerator_sensor",
"oritech:reactor_energy_port",
"oritech:nickel_block",
"oritech:metal_beam_block",
"oritech:machine_plating_block",
"oritech:item_filter_block",
"oritech:reactor_fuel_port",
"oritech:assembler_block",
"oritech:spawner_controller_block",
"oritech:raw_platinum_block",
"oritech:fertilizer_block",
"oritech:accelerator_ring",
"oritech:iron_plating_slab",
"oritech:machine_core_4",
"oritech:big_solar_panel_block",
"oritech:machine_inventory_proxy_addon",
"oritech:augment_application_block",
"oritech:capacitor_addon_extender",
"oritech:low_yield_nuke",
"oritech:plastic_block",
"oritech:fluid_pipe",
"oritech:powered_furnace_block",
"oritech:machine_core_2",
"oritech:raw_nickel_block",
"oritech:duratium_block",
"oritech:superconductor",
"oritech:drone_port_block",
"oritech:machine_speed_addon",
"oritech:ceiling_light_hanging",
"oritech:nickel_plating_block",
"oritech:particle_collector_block",
"oritech:machine_fluid_addon",
"oritech:spawner_cage_block",
"oritech:nickel_plating_slab",
"oritech:big_solar_panel_block",
"oritech:reactor_controller",
"oritech:steam_engine_block",
"oritech:fluxite_block",
"oritech:cooler_block",
"oritech:reactor_vent",
"oritech:item_pipe_duct_block",
"oritech:raw_nickel_block",
"oritech:destroyer_block",
"oritech:laser_arm_block",
"oritech:reactor_rod",
"oritech:nickel_plating_pressure_plate",
"oritech:centrifuge_block",
"oritech:placer_block",
"oritech:platinum_block",
"oritech:machine_core_1",
"oritech:reactor_heat_pipe",
"oritech:reactor_condenser",
"oritech:machine_frame_block",
"oritech:machine_yield_addon",
"oritech:creative_storage_block",
"oritech:machine_acceptor_addon",
"oritech:reactor_quad_rod",
"oritech:tech_door",
"oritech:nickel_block",
"oritech:machine_plating_block",
"oritech:machine_processing_addon",
"oritech:tech_button",
"oritech:nickel_plating_block",
"oritech:charger_block",
"oritech:nickel_plating_pressure_plate",
"oritech:machine_ultimate_addon",
"oritech:accelerator_controller",
"oritech:arcane_augment_station",
"oritech:foundry_block",
"oritech:crop_filter_addon",
"oritech:machine_core_6",
"oritech:fluxite_block",
"oritech:machine_fluid_addon",
"oritech:machine_capacitor_addon",
"oritech:placer_block",
"oritech:reactor_vent",
"oritech:steam_engine_block",
"oritech:enchantment_catalyst_block",
"oritech:quarry_addon",
"oritech:raw_platinum_block",
"oritech:machine_core_5",
"oritech:framed_item_pipe",
"oritech:advanced_augment_station",
"oritech:plastic_block",
"oritech:reactor_wall",
"oritech:reactor_heat_pipe",
"oritech:biomass_block",
"oritech:large_storage_block",
"oritech:steel_block",
"oritech:pump_block",
"oritech:treefeller_block",
"oritech:energite_block",
"oritech:accelerator_motor",
"oritech:machine_speed_addon",
"oritech:fluid_pipe_duct_block",
"oritech:iron_plating_slab",
"oritech:cooler_block",
"oritech:ceiling_light",
"oritech:foundry_block",
"oritech:machine_core_3",
"oritech:biosteel_block",
"oritech:energy_pipe",
"oritech:framed_energy_pipe",
"oritech:deep_drill_block",
"oritech:powered_furnace_block",
"oritech:atomic_forge_block",
"oritech:reactor_fuel_port",
"oritech:machine_yield_addon",
"oritech:fertilizer_block",
"oritech:superconductor_duct_block",
"oritech:energy_pipe_duct_block",
"oritech:reactor_condenser",
"oritech:destroyer_block",
"oritech:spawner_cage_block",
"oritech:electrum_block",
"oritech:iron_plating_stairs",
"oritech:enchanter_block",
"oritech:pulverizer_block",
"oritech:machine_extender",
"oritech:nuke",
"oritech:fuel_generator_block",
"oritech:reactor_redstone_port",
"oritech:reactor_double_rod",
"oritech:adamant_block",
"oritech:machine_hunter_addon",
"oritech:basic_generator_block",
"oritech:machine_plating_slab",
"oritech:reactor_absorber_port",
"oritech:platinum_block",
"oritech:nickel_plating_stairs",
"oritech:iron_plating_stairs",
"oritech:biomass_block",
"oritech:machine_plating_pressure_plate",
"oritech:reactor_reflector",
"oritech:superconductor_duct_block",
"oritech:pipe_booster_block",
"oritech:steam_boiler_addon",
"oritech:iron_plating_block",
"oritech:machine_hunter_addon",
"oritech:fragment_forge_block",
"oritech:industrial_glass_block",
"oritech:silicon_block",
"oritech:simple_augment_station",
"oritech:tech_door",
"oritech:charger_block",
"oritech:machine_processing_addon",
"oritech:reactor_rod",
"oritech:fluid_pipe_duct_block",
"oritech:machine_frame_block",
"oritech:pipe_booster_block",
"oritech:reactor_quad_rod",
"oritech:assembler_block",
"oritech:reactor_reflector",
"oritech:biosteel_block",
"oritech:low_yield_nuke",
"oritech:machine_core_7",
"oritech:machine_acceptor_addon",
"oritech:machine_inventory_proxy_addon",
"oritech:machine_plating_pressure_plate",
"oritech:framed_fluid_pipe",
"oritech:black_hole_block",
"oritech:framed_energy_pipe",
"oritech:bio_generator_block",
"oritech:accelerator_motor",
"oritech:framed_superconductor",
"oritech:machine_efficiency_addon",
"oritech:quarry_addon",
"oritech:tech_lever",
"oritech:reactor_redstone_port",
"oritech:nickel_plating_slab",
"oritech:industrial_glass_block",
"oritech:machine_core_6",
"oritech:nickel_plating_stairs",
"oritech:energy_pipe",
"oritech:machine_core_2",
"oritech:adamant_block",
"oritech:centrifuge_block",
"oritech:accelerator_sensor",
"oritech:creative_storage_block",
"oritech:iron_plating_pressure_plate",
"oritech:fragment_forge_block",
"oritech:lava_generator_block",
"oritech:nuke",
"oritech:enchantment_catalyst_block",
"oritech:tech_button",
"oritech:steel_block",
"oritech:superconductor",
"oritech:fuel_generator_block",
"oritech:large_storage_block",
"oritech:pulverizer_block",
"oritech:duratium_block",
"oritech:arcane_augment_station",
"oritech:bio_generator_block",
"oritech:machine_core_7",
"oritech:electrum_block",
"oritech:augment_application_block",
"oritech:item_pipe",
"oritech:machine_extender",
"oritech:accelerator_ring",
"oritech:laser_arm_block",
"oritech:particle_collector_block",
"oritech:machine_core_4",
"oritech:item_filter_block",
"oritech:reactor_energy_port",
"oritech:iron_plating_block",
"oritech:tech_lever",
"oritech:machine_plating_stairs",
"oritech:enchanter_block",
"oritech:silicon_block",
"oritech:energy_pipe_duct_block",
"oritech:advanced_augment_station",
"oritech:accelerator_controller",
"oritech:reactor_wall",
"oritech:fluid_pipe",
"oritech:item_pipe_duct_block",
"oritech:item_pipe",
"oritech:machine_plating_slab",
"oritech:lava_generator_block",
"oritech:basic_generator_block",
"oritech:treefeller_block",
"oritech:machine_core_3",
"oritech:steam_boiler_addon",
"oritech:machine_redstone_addon",
"oritech:spawner_controller_block",
"oritech:energy_pipe_connection",
"oritech:superconductor_connection",
"oritech:fluid_pipe_connection",
Expand Down
0 ...ated/data/minecraft/tags/fluid/water.json → ...rces/data/minecraft/tags/fluid/water.json
View file
File renamed without changes.
1 change: 0 additions & 1 deletion fabricdatagen/src/main/java/rearth/oritech/fabricgen/OritechDataGenerator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ public void onInitializeDataGenerator(FabricDataGenerator fabricDataGenerator) {
pack.addProvider(ModelGenerator::new);
pack.addProvider(BlockLootGenerator::new);
pack.addProvider(BlockTagGenerator::new);
pack.addProvider(FluidTagGenerator::new);
pack.addProvider(ItemTagGenerator::new);
pack.addProvider(RecipeGenerator::new);
pack.addProvider(AdvancementGenerator::new);
Expand Down
20 changes: 0 additions & 20 deletions fabricdatagen/src/main/java/rearth/oritech/fabricgen/datagen/FluidTagGenerator.java
View file

This file was deleted.

0 comments on commit 3be219d

Please sign in to comment.