Skip to content

Commit

Permalink
move some blocks from NHCore to GT5U (#931)
Browse files Browse the repository at this point in the history
* move WA from NHCore to GT5U

* decouple alloy smelters and amplyfabricators

* decouple assemblers

* decouple autoclaves and bending machines

* decouple compressors and cutting machines

* decouple distilleries, electric furnaces, electrolyzers, electromagnetic separators

* decouple circuit assemblers

* decouple extractors, extruders, arc furnaces, centrifuges, plasma arc furnaces, canning machines, chemical baths,

* decouple sifters, slicers, thermal centrifuges, wiremills

* deprecate GT5U machines in the NHCore item list

* decouple fluid solidifiers, forming presses, forge hammers, Lathes, engravers, macerators, microwaves, orewashing plants, polarizers, recyclers

* moved machine hulls to GT5U

* moved machine plasma gens and alloy smelters to GT5U

* moved machine matter amplifiers, assemblers, scanners, Pump, transformers to GT5U

* moved battery buffer 1,2,3,4, battery charger 4x4, dynamo hatches, energy hatches to GT5U

* moved wet transformers, hi amps transformers, turbo chargers, chest buffers, rock breakers, input hatches, output hatches to GT5U

* moved circuit assemblers to GT5U

* moved chemical bath, chemical reactor, fermenter, fluid canner, fluid extractor, fluid heater, mixer to GT5U

* moved autoclave, bending machine, compressor, cutting machine, distillery, electric furnace, electrolyzer, electromagnetic separator, extractor, extruder, fluid solidifier, forming press, forge hammer, lathe, precision laser engraver, macerator, matter fabricator, microwave, washing plant, polarizer, recycler, replicator, sifter, slicer, thermal centrifuge, wiremill, arc furnace, centrifuge, plasma arc furnace, canning machine to GT5U

* move to GT5U ItemList

* yeet tLastID bullshit

* move batteries to GT5U

* cut down the custom item list

* spotless apply

* fix mistake

* bump dep
  • Loading branch information
boubou19 authored Aug 15, 2024
1 parent 583174e commit 4570e7a
Show file tree
Hide file tree
Showing 16 changed files with 2,340 additions and 8,686 deletions.
2 changes: 1 addition & 1 deletion dependencies.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Add your dependencies here

dependencies {
api("com.github.GTNewHorizons:GT5-Unofficial:5.09.48.151:dev")
api("com.github.GTNewHorizons:GT5-Unofficial:5.09.49.01:dev")
api("com.github.GTNewHorizons:Yamcl:0.6.0:dev")
api("com.github.GTNewHorizons:Baubles:1.0.4:dev")
implementation('com.github.GTNewHorizons:GTNEIOrePlugin:1.3.3:dev') { transitive = false }
Expand Down
9 changes: 4 additions & 5 deletions src/main/java/com/dreammaster/detrav/ScannerTools.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import net.minecraft.item.ItemStack;

import com.detrav.items.DetravMetaGeneratedTool01;
import com.dreammaster.gthandler.CustomItemList;

import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
Expand Down Expand Up @@ -31,7 +30,7 @@ public void registerOre(OrePrefixes o, Materials material, String s, String s2,
new Object[] { "EHR", "CSC", "PBP", 'S', ItemList.Cover_Screen, 'R', ItemList.Sensor_LuV, 'H',
OrePrefixes.toolHeadDrill.get(material), 'E', ItemList.Emitter_LuV, 'C',
OrePrefixes.circuit.get(Materials.LuV), 'P', OrePrefixes.plate.get(Materials.Iridium), 'B',
CustomItemList.BatteryHull_LuV_Full.get(1L) });
ItemList.BatteryHull_LuV_Full.get(1L) });
GT_ModHandler.addCraftingRecipe(
DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(
102,
Expand All @@ -44,7 +43,7 @@ public void registerOre(OrePrefixes o, Materials material, String s, String s2,
new Object[] { "EHR", "CSC", "PBP", 'S', ItemList.Cover_Screen, 'R', ItemList.Sensor_ZPM, 'H',
OrePrefixes.toolHeadDrill.get(material), 'E', ItemList.Emitter_ZPM, 'C',
OrePrefixes.circuit.get(Materials.ZPM), 'P', OrePrefixes.plate.get(Materials.Osmium), 'B',
CustomItemList.BatteryHull_ZPM_Full.get(1L) });
ItemList.BatteryHull_ZPM_Full.get(1L) });
GT_ModHandler.addCraftingRecipe(
DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(
104,
Expand All @@ -57,7 +56,7 @@ public void registerOre(OrePrefixes o, Materials material, String s, String s2,
new Object[] { "EHR", "CSC", "PBP", 'S', ItemList.Cover_Screen, 'R', ItemList.Sensor_UV, 'H',
OrePrefixes.toolHeadDrill.get(material), 'E', ItemList.Emitter_UV, 'C',
OrePrefixes.circuit.get(Materials.UV), 'P', OrePrefixes.plate.get(Materials.Neutronium), 'B',
CustomItemList.BatteryHull_UV_Full.get(1L) });
ItemList.BatteryHull_UV_Full.get(1L) });
GT_ModHandler.addCraftingRecipe(
DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(
106,
Expand All @@ -70,6 +69,6 @@ public void registerOre(OrePrefixes o, Materials material, String s, String s2,
new Object[] { "EHR", "CSC", "PBP", 'S', ItemList.Cover_Screen, 'R', ItemList.Sensor_UHV, 'H',
OrePrefixes.toolHeadDrill.get(material), 'E', ItemList.Emitter_UHV, 'C',
OrePrefixes.circuit.get(Materials.UHV), 'P', OrePrefixes.plate.get(Materials.Infinity), 'B',
CustomItemList.BatteryHull_UHV_Full.get(1L) });
ItemList.BatteryHull_UHV_Full.get(1L) });
}
}
Loading

0 comments on commit 4570e7a

Please sign in to comment.