[ci skip] spotlessApply with the new settings

This commit is contained in:
Jason Mitchell committed 2023-01-28 18:04:28 -08:00
1 parent 83698cb73c
commit 84c2239244
561 files changed
+8872 -9300

No files matched your search

@@ -1,10 +1,11 @@
package tconstruct.plugins.te4;
import cpw.mods.fml.common.event.FMLInterModComms;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.fluids.FluidStack;
import cpw.mods.fml.common.event.FMLInterModComms;
/**
* Taken from CoFHLib
*/
@@ -31,14 +32,14 @@ public class TE4Helper {
addPulverizerRecipe(energy, input, primaryOutput, null, 0);
}
public static void addPulverizerRecipe(
int energy, ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput) {
public static void addPulverizerRecipe(int energy, ItemStack input, ItemStack primaryOutput,
ItemStack secondaryOutput) {
addPulverizerRecipe(energy, input, primaryOutput, secondaryOutput, 100);
}
public static void addPulverizerRecipe(
int energy, ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput, int secondaryChance) {
public static void addPulverizerRecipe(int energy, ItemStack input, ItemStack primaryOutput,
ItemStack secondaryOutput, int secondaryChance) {
if (input == null || primaryOutput == null || secondaryOutput == null) {
return;
@@ -63,14 +64,14 @@ public class TE4Helper {
addSawmillRecipe(energy, input, primaryOutput, null, 0);
}
public static void addSawmillRecipe(
int energy, ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput) {
public static void addSawmillRecipe(int energy, ItemStack input, ItemStack primaryOutput,
ItemStack secondaryOutput) {
addSawmillRecipe(energy, input, primaryOutput, secondaryOutput, 100);
}
public static void addSawmillRecipe(
int energy, ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput, int secondaryChance) {
public static void addSawmillRecipe(int energy, ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput,
int secondaryChance) {
if (input == null || primaryOutput == null || secondaryOutput == null) {
return;
@@ -90,29 +91,20 @@ public class TE4Helper {
FMLInterModComms.sendMessage("ThermalExpansion", "SawmillRecipe", toSend);
}
public static void addSmelterRecipe(
int energy, ItemStack primaryInput, ItemStack secondaryInput, ItemStack primaryOutput) {
public static void addSmelterRecipe(int energy, ItemStack primaryInput, ItemStack secondaryInput,
ItemStack primaryOutput) {
addSmelterRecipe(energy, primaryInput, secondaryInput, primaryOutput, null, 0);
}
public static void addSmelterRecipe(
int energy,
ItemStack primaryInput,
ItemStack secondaryInput,
ItemStack primaryOutput,
ItemStack secondaryOutput) {
public static void addSmelterRecipe(int energy, ItemStack primaryInput, ItemStack secondaryInput,
ItemStack primaryOutput, ItemStack secondaryOutput) {
addSmelterRecipe(energy, primaryInput, secondaryInput, primaryOutput, secondaryOutput, 100);
}
public static void addSmelterRecipe(
int energy,
ItemStack primaryInput,
ItemStack secondaryInput,
ItemStack primaryOutput,
ItemStack secondaryOutput,
int secondaryChance) {
public static void addSmelterRecipe(int energy, ItemStack primaryInput, ItemStack secondaryInput,
ItemStack primaryOutput, ItemStack secondaryOutput, int secondaryChance) {
if (primaryInput == null || secondaryInput == null || primaryOutput == null || secondaryOutput == null) {
return;
@@ -135,8 +127,8 @@ public class TE4Helper {
}
/**
* Use this to register an Ore TYPE as a "Blast" recipe - it will require Pyrotheum Dust to smelt. Do not add the prefix. This is an opt-in for ores which
* do NOT have vanilla furnace recipes.
* Use this to register an Ore TYPE as a "Blast" recipe - it will require Pyrotheum Dust to smelt. Do not add the
* prefix. This is an opt-in for ores which do NOT have vanilla furnace recipes.
*
* Ex: "Steel" or "ElectrumFlux", not "dustSteel" or "dustElectrumFlux"
*
@@ -168,8 +160,8 @@ public class TE4Helper {
FMLInterModComms.sendMessage("ThermalExpansion", "CrucibleRecipe", toSend);
}
public static void addTransposerFill(
int energy, ItemStack input, ItemStack output, FluidStack fluid, boolean reversible) {
public static void addTransposerFill(int energy, ItemStack input, ItemStack output, FluidStack fluid,
boolean reversible) {
if (input == null || output == null || fluid == null) {
return;
@@ -189,8 +181,8 @@ public class TE4Helper {
FMLInterModComms.sendMessage("ThermalExpansion", "TransposerFillRecipe", toSend);
}
public static void addTransposerExtract(
int energy, ItemStack input, ItemStack output, FluidStack fluid, int chance, boolean reversible) {
public static void addTransposerExtract(int energy, ItemStack input, ItemStack output, FluidStack fluid, int chance,
boolean reversible) {
if (input == null || output == null || fluid == null) {
return;
@@ -1,9 +1,7 @@
package tconstruct.plugins.te4;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.registry.*;
import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;
import mantle.pulsar.pulse.*;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
@@ -11,11 +9,15 @@ import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.oredict.*;
import tconstruct.TConstruct;
import tconstruct.library.TConstructRegistry;
import tconstruct.smeltery.TinkerSmeltery;
import tconstruct.tools.TinkerTools;
import tconstruct.world.TinkerWorld;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.registry.*;
import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;
@ObjectHolder(TConstruct.modID)
@Pulse(
@@ -24,6 +26,7 @@ import tconstruct.world.TinkerWorld;
modsRequired = "ThermalExpansion",
forced = true)
public class TinkerTE4 {
@Handler
public void init() {
TConstruct.logger.info("Thermal Expansion detected. Adding Pulverizer & Induction Smelter recipes");
@@ -36,9 +39,17 @@ public class TinkerTE4 {
null,
0);
TE4Helper.addPulverizerRecipe(
1000, new ItemStack(TinkerTools.materials, 1, 3), new ItemStack(TinkerTools.materials, 1, 39), null, 0);
1000,
new ItemStack(TinkerTools.materials, 1, 3),
new ItemStack(TinkerTools.materials, 1, 39),
null,
0);
TE4Helper.addPulverizerRecipe(
1000, new ItemStack(TinkerTools.materials, 1, 4), new ItemStack(TinkerTools.materials, 1, 38), null, 0);
1000,
new ItemStack(TinkerTools.materials, 1, 4),
new ItemStack(TinkerTools.materials, 1, 38),
null,
0);
TE4Helper.addPulverizerRecipe(
12000,
@@ -85,12 +96,13 @@ public class TinkerTE4 {
// Dust Recipes
GameRegistry.addRecipe(
new ShapelessOreRecipe(new ItemStack(TinkerTools.materials, 1, 41), "dustArdite", "dustCobalt"));
GameRegistry.addRecipe(new ShapelessOreRecipe(
new ItemStack(TinkerTools.materials, 4, 42),
"dustAluminum",
"dustAluminum",
"dustAluminum",
"dustCopper"));
GameRegistry.addRecipe(
new ShapelessOreRecipe(
new ItemStack(TinkerTools.materials, 4, 42),
"dustAluminum",
"dustAluminum",
"dustAluminum",
"dustCopper"));
}
@Handler
@@ -1,10 +1,8 @@
package tconstruct.plugins.te4;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.registry.GameRegistry;
import mantle.pulsar.pulse.Handler;
import mantle.pulsar.pulse.Pulse;
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
@@ -12,11 +10,15 @@ import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.oredict.OreDictionary;
import tconstruct.TConstruct;
import tconstruct.library.crafting.FluidType;
import tconstruct.library.crafting.Smeltery;
import tconstruct.smeltery.TinkerSmeltery;
import tconstruct.world.TinkerWorld;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.registry.GameRegistry;
@GameRegistry.ObjectHolder(TinkersThermalFoundation.TF_MOD_ID)
@Pulse(
@@ -25,6 +27,7 @@ import tconstruct.world.TinkerWorld;
modsRequired = TinkersThermalFoundation.TF_MOD_ID,
forced = true)
public class TinkersThermalFoundation {
static final String TF_MOD_ID = "ThermalFoundation";
@Handler
@@ -55,33 +58,32 @@ public class TinkersThermalFoundation {
Smeltery.addSmelteryFuel(pyrotheumFluid, 5000, 70); // pyrotheum lasts 3.5 seconds per 15 mb
// liquid redstone
for (ItemStack stack : OreDictionary.getOres("blockRedstone"))
Smeltery.addMelting(
stack,
Block.getBlockFromItem(stack.getItem()),
stack.getItemDamage(),
3000,
new FluidStack(redstoneFluid, 900));
for (ItemStack stack : OreDictionary.getOres("dustRedstone"))
Smeltery.addMelting(
stack, Blocks.redstone_block, stack.getItemDamage(), 2500, new FluidStack(redstoneFluid, 100));
for (ItemStack stack : OreDictionary.getOres("blockRedstone")) Smeltery.addMelting(
stack,
Block.getBlockFromItem(stack.getItem()),
stack.getItemDamage(),
3000,
new FluidStack(redstoneFluid, 900));
for (ItemStack stack : OreDictionary.getOres("dustRedstone")) Smeltery.addMelting(
stack,
Blocks.redstone_block,
stack.getItemDamage(),
2500,
new FluidStack(redstoneFluid, 100));
// liquid glowstone
for (ItemStack stack : OreDictionary.getOres("glowstone"))
Smeltery.addMelting(
stack,
Block.getBlockFromItem(stack.getItem()),
stack.getItemDamage(),
3000,
new FluidStack(glowstoneFluid, 1000));
for (ItemStack stack : OreDictionary.getOres("dustGlowstone"))
Smeltery.addMelting(
stack, Blocks.glowstone, stack.getItemDamage(), 2500, new FluidStack(glowstoneFluid, 250));
for (ItemStack stack : OreDictionary.getOres("glowstone")) Smeltery.addMelting(
stack,
Block.getBlockFromItem(stack.getItem()),
stack.getItemDamage(),
3000,
new FluidStack(glowstoneFluid, 1000));
for (ItemStack stack : OreDictionary.getOres("dustGlowstone")) Smeltery
.addMelting(stack, Blocks.glowstone, stack.getItemDamage(), 2500, new FluidStack(glowstoneFluid, 250));
// liquid pyrotheum
for (ItemStack stack : OreDictionary.getOres("dustPyrotheum"))
Smeltery.addMelting(
stack, Blocks.glowstone, stack.getItemDamage(), 1299, new FluidStack(pyrotheumFluid, 100));
for (ItemStack stack : OreDictionary.getOres("dustPyrotheum")) Smeltery
.addMelting(stack, Blocks.glowstone, stack.getItemDamage(), 1299, new FluidStack(pyrotheumFluid, 100));
// liquid cryotheum
for (ItemStack stack : OreDictionary.getOres("dustCryotheum"))
@@ -134,6 +136,11 @@ public class TinkersThermalFoundation {
if (stack == null || stack.getItem() == null) stack = new ItemStack(TinkerWorld.metalBlock);
FluidType.registerFluidType(
name, Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), temp, fluid, false);
name,
Block.getBlockFromItem(stack.getItem()),
stack.getItemDamage(),
temp,
fluid,
false);
}
}