Skip to content
This repository has been archived by the owner on May 26, 2024. It is now read-only.

Cleaning! #881

Merged
merged 29 commits into from
May 22, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
8b82edb
Remove fluorite from sandstone references
GTNH-Colen May 14, 2024
db8b0f1
Remove some unused content, rogue useless configs
GTNH-Colen May 14, 2024
b7317d8
Remove more junk
GTNH-Colen May 14, 2024
dd3c63a
Remove more
GTNH-Colen May 14, 2024
3cd32e9
Remove RF converter, I think this is disabled anyway? Or should be?
GTNH-Colen May 14, 2024
c68519a
Opps missed this
GTNH-Colen May 14, 2024
ee88664
Cleaning
GTNH-Colen May 14, 2024
d244b7d
Remove sick blaze, I can't even get this to spawn? The spawn egg also…
GTNH-Colen May 14, 2024
cac8c16
Delete unused Australia textures
GTNH-Colen May 14, 2024
271e057
Unused texture loading
GTNH-Colen May 14, 2024
6ed131f
Bulk remove seemingly unused textures.
GTNH-Colen May 14, 2024
c39c3cf
Remove xpjuice, seemingly no use? Change the localised name of mobess…
GTNH-Colen May 14, 2024
e963a8f
Clean
GTNH-Colen May 14, 2024
14e054a
Unused tooltips
GTNH-Colen May 14, 2024
85168d6
Remove hydrogen blob
GTNH-Colen May 14, 2024
6285887
Spotless apply for branch Cleaning! for #881 (#882)
github-actions[bot] May 14, 2024
959cc22
More cleaning
GTNH-Colen May 14, 2024
a729c3e
Merge remote-tracking branch 'origin/Cleaning!' into Cleaning!
GTNH-Colen May 14, 2024
eeb8bd6
Lots of unused code.
GTNH-Colen May 16, 2024
c3dd25c
Some reflection cleanup
GTNH-Colen May 16, 2024
cf8bcd6
Revert "Remove sick blaze, I can't even get this to spawn? The spawn …
GTNH-Colen May 19, 2024
b61b3fd
Restore random conversion recipes
GTNH-Colen May 19, 2024
8745955
Unused texture
GTNH-Colen May 19, 2024
15fd005
Unused stuff
GTNH-Colen May 19, 2024
ca0485c
Restore some missing textures
GTNH-Colen May 20, 2024
e969b86
Spotless apply for branch Cleaning! for #881 (#883)
github-actions[bot] May 20, 2024
5e78c9e
Conditionally enable xpjuice recipe on OpenBlocks loaded
GTNH-Colen May 20, 2024
865dbc0
Spotless apply for branch Cleaning! for #881 (#884)
github-actions[bot] May 20, 2024
9f6f041
Merge branch 'master' into Cleaning!
Dream-Master May 22, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions src/main/java/gtPlusPlus/core/item/ModItems.java
Original file line number Diff line number Diff line change
Expand Up @@ -716,10 +716,7 @@ public static void init() {

// Xp Fluids - Dev
if (!FluidRegistry.isFluidRegistered("mobessence")) {
FluidUtils.generateFluidNoPrefix("mobessence", "mobessence", 0, new short[] { 125, 175, 125, 100 });
}
if (!FluidRegistry.isFluidRegistered("xpjuice")) {
FluidUtils.generateFluidNoPrefix("xpjuice", "xpjuice", 0, new short[] { 50, 150, 50, 100 });
FluidUtils.generateFluidNoPrefix("mobessence", "Mob Essence", 0, new short[] { 125, 175, 125, 100 });
}

dustNeptunium238 = new DustDecayable(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import gregtech.api.util.GT_Utility;
import gtPlusPlus.api.objects.minecraft.ItemPackage;
import gtPlusPlus.core.util.minecraft.FluidUtils;
import net.minecraftforge.fluids.FluidRegistry;

public class NuclearChem extends ItemPackage {

Expand Down Expand Up @@ -94,7 +95,7 @@ private static void chemReactor_CreateMutagen() {
.itemInputs(
GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherStar, 2),
GT_Utility.getIntegratedCircuit(20))
.fluidInputs(FluidUtils.getMobEssence(5000))
.fluidInputs(FluidRegistry.getFluidStack("mobessence", 5000))
.fluidOutputs(FluidUtils.getFluidStack(GeneticMutagen, 8000)).duration(30 * SECONDS)
.eut(TierEU.RECIPE_HV).addTo(UniversalChemical);
}
Expand Down
6 changes: 0 additions & 6 deletions src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
Original file line number Diff line number Diff line change
Expand Up @@ -565,12 +565,6 @@ private static void laserEngraverRecipes() {
}

private static void breweryRecipes() {
GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(14))
Connor-Colenso marked this conversation as resolved.
Show resolved Hide resolved
.fluidInputs(EnchantingUtils.getMobEssence(100)).fluidOutputs(EnchantingUtils.getLiquidXP(1332))
.duration(5 * SECONDS).eut(TierEU.RECIPE_MV).addTo(brewingRecipes);
GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(14))
.fluidInputs(EnchantingUtils.getLiquidXP(1332)).fluidOutputs(EnchantingUtils.getMobEssence(100))
.duration(5 * SECONDS).eut(TierEU.RECIPE_MV).addTo(brewingRecipes);
GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(BOP_Block_Registrator.sapling_Rainforest))
.fluidInputs(Materials.Water.getFluid(100L)).fluidOutputs(Materials.Biomass.getFluid(100L))
.duration(1 * MINUTES).eut(3).addTo(brewingRecipes);
Expand Down
29 changes: 0 additions & 29 deletions src/main/java/gtPlusPlus/core/util/minecraft/EnchantingUtils.java

This file was deleted.

4 changes: 0 additions & 4 deletions src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -576,10 +576,6 @@ public static Fluid generateGas(final String unlocalizedName, final String local
return gtFluid;
}

public static FluidStack getMobEssence(final int amount) {
return EnchantingUtils.getMobEssence(amount);
}

public static boolean doesFluidExist(String aFluidName) {
FluidStack aFStack1 = (FluidUtils.getFluidStack("molten" + "." + aFluidName.toLowerCase(), 1));
FluidStack aFStack2 = (FluidUtils.getFluidStack("fluid" + "." + aFluidName.toLowerCase(), 1));
Expand Down