Skip to content

Commit

Permalink
spotless apply
Browse files Browse the repository at this point in the history
  • Loading branch information
boubou19 committed Sep 1, 2024
1 parent 7269660 commit 270a561
Show file tree
Hide file tree
Showing 74 changed files with 790 additions and 1,088 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@
import static com.dreammaster.scripts.IScriptLoader.wildcard;
import static gregtech.api.enums.Mods.*;

import com.github.bartimaeusnek.bartworks.system.material.GT_Enhancement.BWGTMetaItems;
import gregtech.api.enums.OrePrefixes;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagInt;
import net.minecraft.nbt.NBTTagString;
Expand Down Expand Up @@ -117,7 +114,6 @@ public void loadConfig() {
API.hideItem(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockPaint", 1));
}


if (Chisel.isModLoaded()) {
API.hideItem(GT_ModHandler.getModItem(Chisel.ID, "amber", 1));
API.hideItem(GT_ModHandler.getModItem(Chisel.ID, "bloodBrick", 1));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import static com.github.bartimaeusnek.bartworks.API.recipe.BartWorksRecipeMaps.radioHatchRecipes;
import static com.github.bartimaeusnek.bartworks.util.BWRecipes.calcDecayTicks;
import static gregtech.api.enums.Mods.GTPlusPlus;
import static gregtech.api.util.GT_RecipeConstants.DECAY_TICKS;

import net.minecraft.item.ItemStack;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import static gregtech.api.enums.Mods.AE2FluidCraft;
import static gregtech.api.enums.Mods.AdventureBackpack;
import static gregtech.api.enums.Mods.AppliedEnergistics2;
import static gregtech.api.enums.Mods.BartWorks;
import static gregtech.api.enums.Mods.BuildCraftFactory;
import static gregtech.api.enums.Mods.Chisel;
import static gregtech.api.enums.Mods.Computronics;
Expand All @@ -12,10 +11,8 @@
import static gregtech.api.enums.Mods.GalacticraftCore;
import static gregtech.api.enums.Mods.GalacticraftMars;
import static gregtech.api.enums.Mods.GalaxySpace;
import static gregtech.api.enums.Mods.GoodGenerator;
import static gregtech.api.enums.Mods.IguanaTweaksTinkerConstruct;
import static gregtech.api.enums.Mods.IndustrialCraft2;
import static gregtech.api.enums.Mods.NewHorizonsCoreMod;
import static gregtech.api.enums.Mods.OpenComputers;
import static gregtech.api.enums.Mods.OpenPrinters;
import static gregtech.api.enums.Mods.ProjectRedIllumination;
Expand All @@ -29,13 +26,13 @@

import java.util.function.Consumer;

import com.dreammaster.item.ItemBucketList;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.oredict.ShapedOreRecipe;

import com.dreammaster.item.ItemBucketList;
import com.dreammaster.main.NHItems;
import com.dreammaster.mantle.MantleManualRecipeRegistry;
import com.dreammaster.recipes.Recipe;
Expand Down Expand Up @@ -570,8 +567,7 @@ public void run() {
ItemList.Casing_Firebricks.get(1L),
tBitMask,
new Object[] { "BCB", "BWB", "BCB", 'B', ItemList.Firebrick.get(1), 'C',
OrePrefixes.dust.get(Materials.Gypsum), 'W',
ItemBucketList.Concrete.get(1) });
OrePrefixes.dust.get(Materials.Gypsum), 'W', ItemBucketList.Concrete.get(1) });

// Air filter multi blocks
GT_ModHandler.addCraftingRecipe(
Expand Down Expand Up @@ -836,7 +832,6 @@ public void run() {
// Diodes
// ===================================================================================================


Materials[] cables = { // Cable material used in the acid gen, diode and energy distributor below
Materials.Bedrockium, // UHV
Materials.Draconium, // UEV
Expand Down Expand Up @@ -891,41 +886,36 @@ public void run() {
GT_ModHandler.addCraftingRecipe(
ItemRegistry.diode12A[i],
BITSD,
new Object[] { "WDW", "DCD", "PDP", 'D', OrePrefixes.componentCircuit.get(Materials.Diode),
'W',
new Object[] { "WDW", "DCD", "PDP", 'D', OrePrefixes.componentCircuit.get(Materials.Diode), 'W',
GT_OreDictUnificator
.get(i < 13 ? OrePrefixes.cableGt12 : OrePrefixes.wireGt12, cable, 1L),
'P', hull, 'C', machinehull });
GT_ModHandler.addCraftingRecipe(
ItemRegistry.diode8A[i],
BITSD,
new Object[] { "WDW", "DCD", "PDP", 'D', OrePrefixes.componentCircuit.get(Materials.Diode),
'W',
new Object[] { "WDW", "DCD", "PDP", 'D', OrePrefixes.componentCircuit.get(Materials.Diode), 'W',
GT_OreDictUnificator
.get(i < 13 ? OrePrefixes.cableGt08 : OrePrefixes.wireGt08, cable, 1L),
'P', hull, 'C', machinehull });
GT_ModHandler.addCraftingRecipe(
ItemRegistry.diode4A[i],
BITSD,
new Object[] { "WDW", "DCD", "PDP", 'D', OrePrefixes.componentCircuit.get(Materials.Diode),
'W',
new Object[] { "WDW", "DCD", "PDP", 'D', OrePrefixes.componentCircuit.get(Materials.Diode), 'W',
GT_OreDictUnificator
.get(i < 13 ? OrePrefixes.cableGt04 : OrePrefixes.wireGt04, cable, 1L),
'P', hull, 'C', machinehull });
GT_ModHandler.addCraftingRecipe(
ItemRegistry.diode2A[i],
BITSD,
new Object[] { "WDW", "DCD", "PDP", 'D', OrePrefixes.componentCircuit.get(Materials.Diode),
'W',
new Object[] { "WDW", "DCD", "PDP", 'D', OrePrefixes.componentCircuit.get(Materials.Diode), 'W',
GT_OreDictUnificator
.get(i < 13 ? OrePrefixes.cableGt02 : OrePrefixes.wireGt02, cable, 1L),
'P', hull, 'C', machinehull });
GT_ModHandler.addCraftingRecipe(
ItemRegistry.diode16A[i],
BITSD,
new Object[] { "WHW", "DCD", "PDP", 'H',
OrePrefixes.componentCircuit.get(Materials.Inductor), 'D',
OrePrefixes.componentCircuit.get(Materials.Diode), 'W',
new Object[] { "WHW", "DCD", "PDP", 'H', OrePrefixes.componentCircuit.get(Materials.Inductor),
'D', OrePrefixes.componentCircuit.get(Materials.Diode), 'W',
GT_OreDictUnificator
.get(i < 13 ? OrePrefixes.cableGt16 : OrePrefixes.wireGt16, cable, 1L),
'P', hull, 'C', machinehull });
Expand All @@ -935,7 +925,6 @@ public void run() {
}
}


GT_ModHandler.addCraftingRecipe(
CustomItemList.UnfiredClayBrick.get(8L),
GT_ModHandler.RecipeBits.NOT_REMOVABLE,
Expand Down
28 changes: 11 additions & 17 deletions src/main/java/com/dreammaster/gthandler/GT_CustomLoader.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,8 @@ public enum AdvancedGTMaterials {

LuV(OrePrefixes.circuit.get(Materials.LuV), OrePrefixes.wireGt02.get(Materials.YttriumBariumCuprate),
Materials.VanadiumGallium, OrePrefixes.wireGt02.get(Materials.HSSG),
OrePrefixes.gemExquisite.get(Materials.Diamond), gregtech.api.enums.ItemList.Gravistar,
"blockGlassLuV",
Materials.get("Rhodium-PlatedPalladium"),
Materials.Enderium),
OrePrefixes.gemExquisite.get(Materials.Diamond), gregtech.api.enums.ItemList.Gravistar, "blockGlassLuV",
Materials.get("Rhodium-PlatedPalladium"), Materials.Enderium),

ZPM(OrePrefixes.circuit.get(Materials.ZPM), OrePrefixes.wireGt04.get(Materials.YttriumBariumCuprate),
Materials.Naquadah, OrePrefixes.wireGt02.get(Materials.Naquadah),
Expand All @@ -36,28 +34,24 @@ public enum AdvancedGTMaterials {

UV(OrePrefixes.circuit.get(Materials.UV), OrePrefixes.wireGt08.get(Materials.YttriumBariumCuprate),
Materials.ElectrumFlux, OrePrefixes.wireGt02.get(Materials.NaquadahAlloy),
OrePrefixes.gemExquisite.get(Materials.GarnetRed), new ItemStack(Blocks.dragon_egg, 1),
"blockGlassUV", Materials.Osmium, Materials.Neutronium),
OrePrefixes.gemExquisite.get(Materials.GarnetRed), new ItemStack(Blocks.dragon_egg, 1), "blockGlassUV",
Materials.Osmium, Materials.Neutronium),

UHV(OrePrefixes.circuit.get(Materials.UHV), OrePrefixes.wireGt16.get(Materials.YttriumBariumCuprate),
Materials.Bedrockium, OrePrefixes.wireGt02.get(Materials.Bedrockium), null, null,
"blockGlassUHV", Materials.Neutronium,
Materials.Neutronium),
Materials.Bedrockium, OrePrefixes.wireGt02.get(Materials.Bedrockium), null, null, "blockGlassUHV",
Materials.Neutronium, Materials.Neutronium),

UEV(OrePrefixes.circuit.get(Materials.UEV), OrePrefixes.wireGt04.get(Materials.Bedrockium), Materials.Draconium,
OrePrefixes.wireGt02.get(Materials.Draconium), null, null,
"blockGlassUEV", Materials.Bedrockium,
OrePrefixes.wireGt02.get(Materials.Draconium), null, null, "blockGlassUEV", Materials.Bedrockium,
Materials.Infinity),

UIV(OrePrefixes.circuit.get(Materials.UIV), OrePrefixes.wireGt08.get(Materials.Bedrockium),
Materials.NetherStar, OrePrefixes.wireGt02.get(Materials.NetherStar), null, null,
"blockGlassUIV", Materials.CosmicNeutronium,
MaterialsUEVplus.TranscendentMetal),
Materials.NetherStar, OrePrefixes.wireGt02.get(Materials.NetherStar), null, null, "blockGlassUIV",
Materials.CosmicNeutronium, MaterialsUEVplus.TranscendentMetal),

UMV(OrePrefixes.circuit.get(Materials.UMV), OrePrefixes.wireGt16.get(Materials.Bedrockium), Materials.Quantium,
OrePrefixes.wireGt02.get(Materials.Quantium), null, null,
"blockGlassUMV", MaterialsUEVplus.TranscendentMetal,
MaterialsUEVplus.SpaceTime);
OrePrefixes.wireGt02.get(Materials.Quantium), null, null, "blockGlassUMV",
MaterialsUEVplus.TranscendentMetal, MaterialsUEVplus.SpaceTime);

private Object _mCircuit;
private Object _mHeatingCoil;
Expand Down
Loading

0 comments on commit 270a561

Please sign in to comment.