mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-16 10:34:53 +00:00
[ci skip] spotlessApply with the new settings
This commit is contained in:
1 parent
4711be8028
commit
94aa9346b1
1282 files changed
+15755
-16296
No files matched your search
@@ -1,15 +1,29 @@
|
||||
/*******************************************************************************
|
||||
* Copyright (c) 2011-2014 SirSengir.
|
||||
* All rights reserved. This program and the accompanying materials
|
||||
* are made available under the terms of the GNU Lesser Public License v3
|
||||
* which accompanies this distribution, and is available at
|
||||
* http://www.gnu.org/licenses/lgpl-3.0.txt
|
||||
* Copyright (c) 2011-2014 SirSengir. All rights reserved. This program and the accompanying materials are made
|
||||
* available under the terms of the GNU Lesser Public License v3 which accompanies this distribution, and is available
|
||||
* at http://www.gnu.org/licenses/lgpl-3.0.txt
|
||||
*
|
||||
* Various Contributors including, but not limited to:
|
||||
* SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
|
||||
* Various Contributors including, but not limited to: SirSengir (original work), CovertJaguar, Player, Binnie,
|
||||
* MysteriousAges
|
||||
******************************************************************************/
|
||||
package forestry.plugins;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraftforge.client.event.TextureStitchEvent;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.event.entity.player.FillBucketEvent;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
|
||||
import cpw.mods.fml.common.eventhandler.Event;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
@@ -29,20 +43,6 @@ import forestry.core.items.ItemLiquidContainer;
|
||||
import forestry.core.items.ItemRegistryFluids;
|
||||
import forestry.core.utils.Log;
|
||||
import forestry.core.utils.StringUtil;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraftforge.client.event.TextureStitchEvent;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.event.entity.player.FillBucketEvent;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
|
||||
@Plugin(
|
||||
pluginID = "Fluids",
|
||||
@@ -60,10 +60,8 @@ public class PluginFluids extends ForestryPlugin {
|
||||
if (forestryFluid.getFluid() == null && Config.isFluidEnabled(forestryFluid)) {
|
||||
String fluidName = forestryFluid.getTag();
|
||||
if (!FluidRegistry.isFluidRegistered(fluidName)) {
|
||||
Fluid fluid = new Fluid(fluidName)
|
||||
.setDensity(forestryFluid.getDensity())
|
||||
.setViscosity(forestryFluid.getViscosity())
|
||||
.setTemperature(forestryFluid.getTemperature());
|
||||
Fluid fluid = new Fluid(fluidName).setDensity(forestryFluid.getDensity())
|
||||
.setViscosity(forestryFluid.getViscosity()).setTemperature(forestryFluid.getTemperature());
|
||||
FluidRegistry.registerFluid(fluid);
|
||||
createBlock(forestryFluid);
|
||||
}
|
||||
@@ -88,7 +86,9 @@ public class PluginFluids extends ForestryPlugin {
|
||||
"Pre-existing {0} fluid block detected, deferring to {1}:{2}, "
|
||||
+ "this may cause issues if the server/client have different mod load orders, "
|
||||
+ "recommended that you disable all but one instance of {0} fluid blocks via your configs.",
|
||||
fluid.getName(), blockID.modId, blockID.name);
|
||||
fluid.getName(),
|
||||
blockID.modId,
|
||||
blockID.name);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -131,25 +131,39 @@ public class PluginFluids extends ForestryPlugin {
|
||||
|
||||
if (RecipeManagers.squeezerManager != null) {
|
||||
RecipeManagers.squeezerManager.addContainerRecipe(
|
||||
10, items.canEmpty.getItemStack(), PluginCore.items.ingotTin.getItemStack(), 0.05f);
|
||||
10,
|
||||
items.canEmpty.getItemStack(),
|
||||
PluginCore.items.ingotTin.getItemStack(),
|
||||
0.05f);
|
||||
RecipeManagers.squeezerManager.addContainerRecipe(
|
||||
10, items.waxCapsuleEmpty.getItemStack(), PluginCore.items.beeswax.getItemStack(), 0.10f);
|
||||
10,
|
||||
items.waxCapsuleEmpty.getItemStack(),
|
||||
PluginCore.items.beeswax.getItemStack(),
|
||||
0.10f);
|
||||
RecipeManagers.squeezerManager.addContainerRecipe(
|
||||
10, items.refractoryEmpty.getItemStack(), PluginCore.items.refractoryWax.getItemStack(), 0.10f);
|
||||
10,
|
||||
items.refractoryEmpty.getItemStack(),
|
||||
PluginCore.items.refractoryWax.getItemStack(),
|
||||
0.10f);
|
||||
}
|
||||
|
||||
FluidStack ethanol = Fluids.ETHANOL.getFluid(1);
|
||||
GeneratorFuel ethanolFuel = new GeneratorFuel(
|
||||
ethanol, (int) (32 * ForestryAPI.activeMode.getFloatSetting("fuel.ethanol.generator")), 4);
|
||||
ethanol,
|
||||
(int) (32 * ForestryAPI.activeMode.getFloatSetting("fuel.ethanol.generator")),
|
||||
4);
|
||||
FuelManager.generatorFuel.put(ethanol.getFluid(), ethanolFuel);
|
||||
|
||||
FluidStack biomass = Fluids.BIOMASS.getFluid(1);
|
||||
GeneratorFuel biomassFuel = new GeneratorFuel(
|
||||
biomass, (int) (8 * ForestryAPI.activeMode.getFloatSetting("fuel.biomass.generator")), 1);
|
||||
biomass,
|
||||
(int) (8 * ForestryAPI.activeMode.getFloatSetting("fuel.biomass.generator")),
|
||||
1);
|
||||
FuelManager.generatorFuel.put(biomass.getFluid(), biomassFuel);
|
||||
}
|
||||
|
||||
public static class MissingFluidException extends RuntimeException {
|
||||
|
||||
public MissingFluidException(String tag) {
|
||||
super("Fluid '" + tag + "' was not found. Please check your configs.");
|
||||
}
|
||||
@@ -165,6 +179,7 @@ public class PluginFluids extends ForestryPlugin {
|
||||
}
|
||||
|
||||
public static class TextureHook {
|
||||
|
||||
@SubscribeEvent
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void textureHook(TextureStitchEvent.Post event) {
|
||||
@@ -185,6 +200,7 @@ public class PluginFluids extends ForestryPlugin {
|
||||
}
|
||||
|
||||
public static class FillBucketHook {
|
||||
|
||||
@SubscribeEvent
|
||||
public void fillBucket(FillBucketEvent event) {
|
||||
ItemStack bucket = event.current;
|
||||
|
||||
Reference in new issue
Block a user