Skip to content

Commit

Permalink
Improve sources of Cryotheum (#3918)
Browse files Browse the repository at this point in the history 
Co-authored-by: Martin Robertz <[email protected]>
  • Loading branch information
@StaffiX @Dream-Master
StaffiX and Dream-Master authored Feb 12, 2025
1 parent 5c560fc commit 4bbb29c
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 26 deletions.
2 changes: 1 addition & 1 deletion src/main/java/gregtech/loaders/materials/MaterialsInit1.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ public static void load() {
Materials.Atlarus = new Materials( 965, TextureSet.SET_METALLIC , 6.0F, 64, 2, 1|2 |8 |64 , 255, 255, 255, 0, "Atlarus" , "Atlarus" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes._NULL );
Materials.Bitumen = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1 |8 , 255, 255, 255, 0, "Bitumen" , "Bitumen" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes._NULL );
Materials.Black = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 0 , 0, 0, 0, 0, "Black" , "Black" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeBlack );
Materials.Blizz = new Materials( 851, TextureSet.SET_SHINY , 1.0F, 0, 2, 1 , 220, 233, 255, 0, "Blizz" , "Blizz" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL );
Materials.Blizz = new Materials( 851, TextureSet.SET_SHINY , 1.0F, 0, 2, 1 , 220, 233, 255, 0, "Blizz" , "Blizz" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL ).disableAutoGeneratedRecycleRecipes();
Materials.Blueschist = new Materials( 852, TextureSet.SET_DULL , 1.0F, 0, 2, 1 , 255, 255, 255, 0, "Blueschist" , "Blueschist" , 0, 0, -1, 0, false, false, 0, 1, 1, Dyes.dyeLightBlue );
Materials.Bluestone = new Materials( 813, TextureSet.SET_DULL , 1.0F, 0, 2, 1 , 255, 255, 255, 0, "Bluestone" , "Bluestone" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeBlue );
Materials.Bloodstone = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1 , 255, 255, 255, 0, "Bloodstone" , "Bloodstone" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeRed );
Expand Down
10 changes: 10 additions & 0 deletions src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -595,6 +595,16 @@ public void run() {
.eut(2)
.addTo(maceratorRecipes);

GTValues.RA.stdBuilder()
.itemInputs(GTOreDictUnificator.get(OrePrefixes.rod, Materials.Blizz, 1))
.itemOutputs(
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Blizz, 3),
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Blizz, 1))
.outputChances(10000, 5000)
.duration(20 * SECONDS)
.eut(2)
.addTo(maceratorRecipes);

GTValues.RA.stdBuilder()
.itemInputs(new ItemStack(Blocks.web, 1, 0))
.itemOutputs(new ItemStack(Items.string, 1), new ItemStack(Items.string, 1))
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/gregtech/loaders/preload/LoaderGTItemData.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,9 @@ public void run() {
GTOreDictUnificator.addItemData(new ItemStack(Items.wheat, 1, 32767), new ItemData(Materials.Wheat, 3628800L));
GTOreDictUnificator
.addItemData(new ItemStack(Blocks.hay_block, 1, 32767), new ItemData(Materials.Wheat, 32659200L));
GTOreDictUnificator.addItemData(new ItemStack(Items.snowball, 1, 32767), new ItemData(Materials.Snow, 907200L));
GTOreDictUnificator.addItemData(new ItemStack(Blocks.snow, 1, 32767), new ItemData(Materials.Snow, 3628800L));
GTOreDictUnificator
.addItemData(new ItemStack(Items.snowball, 1, 32767), new ItemData(Materials.Snow, 3628800L));
GTOreDictUnificator.addItemData(new ItemStack(Blocks.snow, 1, 32767), new ItemData(Materials.Snow, 14515200L));
GTOreDictUnificator
.addItemData(new ItemStack(Blocks.glowstone, 1, 32767), new ItemData(Materials.Glowstone, 14515200L));
GTOreDictUnificator.addItemData(
Expand Down
24 changes: 8 additions & 16 deletions src/main/java/gtPlusPlus/core/common/CommonProxy.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,26 +165,18 @@ public void registerCustomMobDrops() {

// GalaxySpace Support
if (Mods.GalaxySpace.isModLoaded()) {
ItemStack aSmallBlizz = ItemUtils.getItemStackOfAmountFromOreDict("dustSmallBlizz", 1);
ItemStack aTinyBlizz = ItemUtils.getItemStackOfAmountFromOreDict("dustTinyBlizz", 1);
ItemStack aSmallCryo = ItemUtils.getItemStackOfAmountFromOreDict("dustSmallCryotheum", 1);
ItemStack aTinyCryo = ItemUtils.getItemStackOfAmountFromOreDict("dustTinyCryotheum", 1);
ItemStack aBlizz = ItemUtils.getItemStackOfAmountFromOreDict("dustBlizz", 1);
ItemStack aCryo = ItemUtils.getItemStackOfAmountFromOreDict("dustCryotheum", 1);
EntityUtils.registerDropsForMob(
EntityEvolvedColdBlaze.class,
ItemUtils.getItemStackOfAmountFromOreDict("stickBlizz", 1),
2,
500);
if (aSmallBlizz != null) {
EntityUtils.registerDropsForMob(EntityEvolvedColdBlaze.class, aSmallBlizz, 2, 750);
}
if (aTinyBlizz != null) {
EntityUtils.registerDropsForMob(EntityEvolvedColdBlaze.class, aTinyBlizz, 4, 1500);
}
if (aSmallCryo != null) {
EntityUtils.registerDropsForMob(EntityEvolvedColdBlaze.class, aSmallCryo, 1, 50);
1,
2500);
if (aBlizz != null) {
EntityUtils.registerDropsForMob(EntityEvolvedColdBlaze.class, aBlizz, 1, 5000);
}
if (aTinyCryo != null) {
EntityUtils.registerDropsForMob(EntityEvolvedColdBlaze.class, aTinyCryo, 2, 100);
if (aCryo != null) {
EntityUtils.registerDropsForMob(EntityEvolvedColdBlaze.class, aCryo, 1, 200);
}
}
}
Expand Down
13 changes: 6 additions & 7 deletions src/main/java/gtPlusPlus/xmod/thermalfoundation/recipe/TFGregtechRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ public static void run() {

private static void start() {

final FluidStack moltenBlaze = getFluidStack("molten.blaze", 1440);

// Gelid Cryotheum
GTValues.RA.stdBuilder()
.itemInputs(GTOreDictUnificator.get(OrePrefixes.ore, Materials.Cinnabar, 1L))
Expand All @@ -38,18 +36,19 @@ private static void start() {

// Blizz Powder
GTValues.RA.stdBuilder()
.itemInputs(new ItemStack(Items.snowball, 4))
.itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Blizz, 1L))
.fluidInputs(moltenBlaze)
.duration(20 * SECONDS)
.itemInputs(new ItemStack(Items.blaze_powder, 4))
.itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Blizz, 4L))
.fluidInputs(Materials.LiquidNitrogen.getGas(100L))
.duration(5 * SECONDS)
.eut(TierEU.RECIPE_HV / 2)
.noOptimize()
.addTo(chemicalBathRecipes);

// Blizz Rod
GTValues.RA.stdBuilder()
.itemInputs(new ItemStack(Items.blaze_rod))
.itemOutputs(GTOreDictUnificator.get(OrePrefixes.stick, Materials.Blizz, 1L))
.duration(((int) Math.max((Materials.Blaze.getMass() * 4) * 3L, 1L)) * TICKS)
.duration(((int) Math.max((Materials.Blaze.getMass()) * 3L, 1L)) * TICKS)
.eut(TierEU.RECIPE_MV)
.addTo(vacuumFreezerRecipes);

Expand Down

0 comments on commit 4bbb29c

Please sign in to comment.