mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-20 20:12:19 +00:00
Rename files to be more consistent. Add missing headers, tidy up Utils
This commit is contained in:
1 parent
37dd0efee2
commit
1e89bab556
576 files changed
+3811
-3923
No files matched your search
@@ -33,27 +33,28 @@ import forestry.api.storage.BackpackManager;
|
||||
import forestry.api.storage.IBackpackDefinition;
|
||||
import forestry.api.storage.ICrateRegistry;
|
||||
import forestry.api.storage.StorageManager;
|
||||
import forestry.core.GameMode;
|
||||
import forestry.core.blocks.BlockBase;
|
||||
import forestry.core.circuits.Circuit;
|
||||
import forestry.core.circuits.CircuitLayout;
|
||||
import forestry.core.config.Defaults;
|
||||
import forestry.core.config.Constants;
|
||||
import forestry.core.config.ForestryBlock;
|
||||
import forestry.core.config.ForestryItem;
|
||||
import forestry.core.config.GameMode;
|
||||
import forestry.core.fluids.Fluids;
|
||||
import forestry.core.gadgets.BlockBase;
|
||||
import forestry.core.gadgets.MachineDefinition;
|
||||
import forestry.core.fluids.LiquidRegistryHelper;
|
||||
import forestry.core.proxy.Proxies;
|
||||
import forestry.core.utils.LiquidHelper;
|
||||
import forestry.core.utils.RecipeUtil;
|
||||
import forestry.core.utils.ShapedRecipeCustom;
|
||||
import forestry.core.utils.StackUtils;
|
||||
import forestry.core.recipes.RecipeUtil;
|
||||
import forestry.core.recipes.ShapedRecipeCustom;
|
||||
import forestry.core.tiles.MachineDefinition;
|
||||
import forestry.core.utils.ItemStackUtil;
|
||||
import forestry.core.utils.Log;
|
||||
import forestry.energy.circuits.CircuitElectricBoost;
|
||||
import forestry.energy.circuits.CircuitElectricChoke;
|
||||
import forestry.energy.circuits.CircuitElectricEfficiency;
|
||||
import forestry.energy.circuits.CircuitFireDampener;
|
||||
import forestry.energy.gadgets.EngineDefinition;
|
||||
import forestry.energy.gadgets.EngineTin;
|
||||
import forestry.energy.gadgets.MachineGenerator;
|
||||
import forestry.energy.tiles.EngineDefinition;
|
||||
import forestry.energy.tiles.TileEngineElectric;
|
||||
import forestry.energy.tiles.TileGenerator;
|
||||
import forestry.farming.circuits.CircuitFarmLogic;
|
||||
import forestry.farming.logic.FarmLogicRubber;
|
||||
|
||||
@@ -61,14 +62,14 @@ import ic2.api.item.IC2Items;
|
||||
import ic2.api.recipe.RecipeInputItemStack;
|
||||
import ic2.api.recipe.Recipes;
|
||||
|
||||
@Plugin(pluginID = "IC2", name = "IndustrialCraft2", author = "SirSengir", url = Defaults.URL, unlocalizedDescription = "for.plugin.ic2.description")
|
||||
@Plugin(pluginID = "IC2", name = "IndustrialCraft2", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.ic2.description")
|
||||
public class PluginIC2 extends ForestryPlugin {
|
||||
|
||||
public static PluginIC2 instance;
|
||||
|
||||
// Forestry stuff
|
||||
private static MachineDefinition definitionGenerator;
|
||||
private static MachineDefinition definitionEngineTin;
|
||||
private static MachineDefinition definitionEngineElectric;
|
||||
|
||||
// IC2 stuff
|
||||
private static ItemStack plantBall;
|
||||
@@ -119,9 +120,9 @@ public class PluginIC2 extends ForestryPlugin {
|
||||
public void preInit() {
|
||||
super.preInit();
|
||||
|
||||
definitionEngineTin = ((BlockBase) ForestryBlock.engine.block()).addDefinition(new EngineDefinition(Defaults.DEFINITION_ENGINETIN_META, "forestry.EngineTin", EngineTin.class,
|
||||
PluginEnergy.proxy.getRenderDefaultEngine(Defaults.TEXTURE_PATH_BLOCKS + "/engine_tin_"), ShapedRecipeCustom.createShapedRecipe(
|
||||
ForestryBlock.engine.getItemStack(1, Defaults.DEFINITION_ENGINETIN_META),
|
||||
definitionEngineElectric = ((BlockBase) ForestryBlock.engine.block()).addDefinition(new EngineDefinition(Constants.DEFINITION_ENGINE_ELECTRIC_META, "forestry.EngineTin", TileEngineElectric.class,
|
||||
PluginEnergy.proxy.getRenderDefaultEngine(Constants.TEXTURE_PATH_BLOCKS + "/engine_tin_"), ShapedRecipeCustom.createShapedRecipe(
|
||||
ForestryBlock.engine.getItemStack(1, Constants.DEFINITION_ENGINE_ELECTRIC_META),
|
||||
"###",
|
||||
" X ",
|
||||
"YVY",
|
||||
@@ -130,9 +131,9 @@ public class PluginIC2 extends ForestryPlugin {
|
||||
'Y', "gearTin",
|
||||
'V', Blocks.piston)));
|
||||
|
||||
definitionGenerator = ((BlockBase) ForestryBlock.engine.block()).addDefinition(new MachineDefinition(Defaults.DEFINITION_GENERATOR_META, "forestry.Generator", MachineGenerator.class,
|
||||
Proxies.render.getRenderDefaultMachine(Defaults.TEXTURE_PATH_BLOCKS + "/generator_"), ShapedRecipeCustom.createShapedRecipe(
|
||||
ForestryBlock.engine.getItemStack(1, Defaults.DEFINITION_GENERATOR_META),
|
||||
definitionGenerator = ((BlockBase) ForestryBlock.engine.block()).addDefinition(new MachineDefinition(Constants.DEFINITION_GENERATOR_META, "forestry.Generator", TileGenerator.class,
|
||||
Proxies.render.getRenderDefaultMachine(Constants.TEXTURE_PATH_BLOCKS + "/generator_"), ShapedRecipeCustom.createShapedRecipe(
|
||||
ForestryBlock.engine.getItemStack(1, Constants.DEFINITION_GENERATOR_META),
|
||||
"X#X",
|
||||
"XYX",
|
||||
"X#X",
|
||||
@@ -145,7 +146,7 @@ public class PluginIC2 extends ForestryPlugin {
|
||||
lavaCell = IC2Items.getItem("lavaCell");
|
||||
waterCell = IC2Items.getItem("waterCell");
|
||||
} else {
|
||||
Proxies.log.fine("IC2 empty cell could not be found. Skipped adding IC2 liquid containers.");
|
||||
Log.fine("IC2 empty cell could not be found. Skipped adding IC2 liquid containers.");
|
||||
}
|
||||
|
||||
// rubber chain
|
||||
@@ -185,10 +186,10 @@ public class PluginIC2 extends ForestryPlugin {
|
||||
Recipes.recyclerBlacklist.add(new RecipeInputItemStack(ForestryItem.beePrincessGE.getItemStack()));
|
||||
}
|
||||
} else {
|
||||
Proxies.log.severe("IC2 Recipes.recyclerBlacklist not found.");
|
||||
Log.severe("IC2 Recipes.recyclerBlacklist not found.");
|
||||
}
|
||||
|
||||
definitionEngineTin.register();
|
||||
definitionEngineElectric.register();
|
||||
definitionGenerator.register();
|
||||
|
||||
Circuit.energyElectricChoke1 = new CircuitElectricChoke("electric.choke.1");
|
||||
@@ -261,45 +262,45 @@ public class PluginIC2 extends ForestryPlugin {
|
||||
}
|
||||
|
||||
if (plantBall != null) {
|
||||
RecipeUtil.injectLeveledRecipe(plantBall, GameMode.getGameMode().getIntegerSetting("fermenter.yield.wheat") * 9, Fluids.BIOMASS);
|
||||
RecipeUtil.addFermenterRecipes(plantBall, GameMode.getGameMode().getIntegerSetting("fermenter.yield.wheat") * 9, Fluids.BIOMASS);
|
||||
}
|
||||
if (compressedPlantBall != null) {
|
||||
RecipeUtil.injectLeveledRecipe(compressedPlantBall, GameMode.getGameMode().getIntegerSetting("fermenter.yield.wheat") * 9, Fluids.BIOMASS);
|
||||
RecipeUtil.addFermenterRecipes(compressedPlantBall, GameMode.getGameMode().getIntegerSetting("fermenter.yield.wheat") * 9, Fluids.BIOMASS);
|
||||
}
|
||||
|
||||
if (resin != null) {
|
||||
RecipeManagers.centrifugeManager.addRecipe(20, ForestryItem.propolis.getItemStack(), ImmutableMap.of(resin, 1.0f));
|
||||
} else {
|
||||
Proxies.log.fine("Missing IC2 resin, skipping centrifuge recipe for propolis to resin.");
|
||||
Log.fine("Missing IC2 resin, skipping centrifuge recipe for propolis to resin.");
|
||||
}
|
||||
|
||||
if (rubbersapling != null) {
|
||||
RecipeUtil.injectLeveledRecipe(rubbersapling, GameMode.getGameMode().getIntegerSetting("fermenter.yield.sapling"), Fluids.BIOMASS);
|
||||
RecipeUtil.addFermenterRecipes(rubbersapling, GameMode.getGameMode().getIntegerSetting("fermenter.yield.sapling"), Fluids.BIOMASS);
|
||||
} else {
|
||||
Proxies.log.fine("Missing IC2 rubber sapling, skipping fermenter recipe for converting rubber sapling to biomass.");
|
||||
Log.fine("Missing IC2 rubber sapling, skipping fermenter recipe for converting rubber sapling to biomass.");
|
||||
}
|
||||
|
||||
if (rubbersapling != null && resin != null) {
|
||||
String saplingName = GameData.getBlockRegistry().getNameForObject(StackUtils.getBlock(rubbersapling));
|
||||
String saplingName = GameData.getBlockRegistry().getNameForObject(ItemStackUtil.getBlock(rubbersapling));
|
||||
String resinName = GameData.getItemRegistry().getNameForObject(resin.getItem());
|
||||
String imc = String.format("farmArboreal@%s.%s.%s.%s",
|
||||
saplingName, rubbersapling.getItemDamage(),
|
||||
resinName, resin.getItemDamage());
|
||||
Proxies.log.finest("Sending IMC '%s'.", imc);
|
||||
FMLInterModComms.sendMessage(Defaults.MOD, "add-farmable-sapling", imc);
|
||||
Log.finest("Sending IMC '%s'.", imc);
|
||||
FMLInterModComms.sendMessage(Constants.MOD, "add-farmable-sapling", imc);
|
||||
}
|
||||
|
||||
FluidStack biogas = FluidRegistry.getFluidStack("ic2biogas", 1000);
|
||||
if (biogas != null && PluginManager.Module.ENERGY.isEnabled()) {
|
||||
FuelManager.bronzeEngineFuel.put(biogas.getFluid(), new EngineBronzeFuel(Fluids.BIOMASS.getFluid(),
|
||||
Defaults.ENGINE_FUEL_VALUE_BIOMASS, (int) ((Defaults.ENGINE_CYCLE_DURATION_BIOMASS * GameMode.getGameMode().getFloatSetting("fuel.biomass.biogas"))), 1));
|
||||
Constants.ENGINE_FUEL_VALUE_BIOMASS, (int) ((Constants.ENGINE_CYCLE_DURATION_BIOMASS * GameMode.getGameMode().getFloatSetting("fuel.biomass.biogas"))), 1));
|
||||
}
|
||||
if (lavaCell != null) {
|
||||
LiquidHelper.injectTinContainer(Fluids.LAVA, Defaults.BUCKET_VOLUME, lavaCell, emptyCell);
|
||||
LiquidRegistryHelper.registerTinContainer(Fluids.LAVA, Constants.BUCKET_VOLUME, lavaCell, emptyCell);
|
||||
}
|
||||
|
||||
if (waterCell != null) {
|
||||
LiquidHelper.injectTinContainer(Fluids.WATER, Defaults.BUCKET_VOLUME, waterCell, emptyCell);
|
||||
LiquidRegistryHelper.registerTinContainer(Fluids.WATER, Constants.BUCKET_VOLUME, waterCell, emptyCell);
|
||||
|
||||
ItemStack bogEarthCan = GameMode.getGameMode().getStackSetting("recipe.output.bogearth.can");
|
||||
if (bogEarthCan.stackSize > 0) {
|
||||
|
||||
Reference in new issue
Block a user