diff options
Diffstat (limited to 'src/Java/gtPlusPlus/xmod')
3 files changed, 97 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java b/src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java index ef1dd0e353..895ad35a14 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java @@ -29,7 +29,7 @@ import net.minecraftforge.client.event.RenderPlayerEvent; public class GTPP_CapeRenderer extends RenderPlayer { - private final ResourceLocation[] mCapes = {new ResourceLocation("miscutils:textures/OrangeHD.png"), new ResourceLocation("miscutils:textures/TesterCapeHD.png"), new ResourceLocation("miscutils:textures/FancyCapeHD.png"), new ResourceLocation("miscutils:textures/DevCapeHD.png"), new ResourceLocation("miscutils:textures/PatreonCapeHD.png")}; + private final ResourceLocation[] mCapes = {new ResourceLocation("miscutils:textures/OrangeHD.png"), new ResourceLocation("miscutils:textures/FancyCapeHD.png"), new ResourceLocation("miscutils:textures/TesterCapeHD.png"), new ResourceLocation("miscutils:textures/DevCapeHD.png"), new ResourceLocation("miscutils:textures/PatreonCapeHD.png")}; private final Collection<String> mCapeList; public GTPP_CapeRenderer(Collection<String> aCapeList) { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java index 3f2d622c70..931896b2e2 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java @@ -34,7 +34,6 @@ import net.minecraftforge.fluids.FluidStack; public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase { - public GT_Recipe mLastRecipe; protected long mEUStore; protected int fuelConsumption = 0; protected int fuelValue = 0; @@ -447,6 +446,7 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase { } + if (this.getBaseMetaTileEntity().getWorld().getTotalWorldTime() % 100 == 0) { //Try Sparge Noble Gases if (this.heliumSparging){ if (this.depleteInput(Materials.Helium.getGas(1000L))){ @@ -484,6 +484,7 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase { } } } + } if (aFuel != null){ diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java new file mode 100644 index 0000000000..5b897a0ad0 --- /dev/null +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java @@ -0,0 +1,94 @@ +package gtPlusPlus.xmod.gregtech.loaders.recipe; + +import java.util.Collection; + +import net.minecraft.item.ItemStack; + +import gregtech.api.util.GT_Recipe; +import gregtech.api.util.Recipe_GT; + +import gtPlusPlus.api.objects.minecraft.NoConflictGTRecipeMap; +import gtPlusPlus.core.recipe.common.CI; +import gtPlusPlus.core.util.minecraft.FluidUtils; +import net.minecraftforge.fluids.FluidStack; + +public class RecipeLoader_LFTR { + + + protected final static NoConflictGTRecipeMap mRecipesLFTR = new NoConflictGTRecipeMap(); + + public static Collection<GT_Recipe> getRecipes(){ + return mRecipesLFTR.getRecipeMap(); + } + + public static void generate() { + // Fli2BeF4 + Thorium TetraFluoride = Uranium233 + //72k Ticks/hr + //1l/4t = 1000l/hr + //1l/40t = 1000l/10hr (Probably better) LiFBeF2ThF4UF4 + //1l/20t= 1000l/2.5hr LiFBeF2ZrF4UF4 + //1l/10t= 1000l/2.5hr LiFBeF2ZrF4U235 + + //LiFBeF2ThF4UF4 + GT_Recipe LFTR1 = new Recipe_GT( + true, + new ItemStack[] {CI.getNumberedCircuit(1)}, + new ItemStack[] {}, + null, new int[] {5000, 2500}, + new FluidStack[] { + FluidUtils.getFluidStack("molten.li2bef4", 34), + FluidUtils.getFluidStack("molten.LiFBeF2ThF4UF4".toLowerCase(), 17) + }, + new FluidStack[] { + FluidUtils.getFluidStack("molten.uraniumhexafluoride", 10), + FluidUtils.getFluidStack("molten.uraniumhexafluoride", 5) + }, + 12000,//time + 0,//cost + 4096//fuel value + ); + + //LiFBeF2ZrF4UF4 + GT_Recipe LFTR2 = new Recipe_GT( + true, + new ItemStack[] {CI.getNumberedCircuit(2)}, + new ItemStack[] {}, + null, new int[] {2500, 1250}, + new FluidStack[] { + FluidUtils.getFluidStack("molten.li2bef4", 34), + FluidUtils.getFluidStack("molten.LiFBeF2ZrF4UF4".toLowerCase(), 17) + }, + new FluidStack[] { + FluidUtils.getFluidStack("molten.uraniumhexafluoride", 4), + FluidUtils.getFluidStack("molten.uraniumhexafluoride", 2) + }, + 6000,//time + 0,//cost + 4096//fuel value + ); + + //LiFBeF2ZrF4U235 + GT_Recipe LFTR3 = new Recipe_GT( + true, + new ItemStack[] {CI.getNumberedCircuit(3)}, + new ItemStack[] {}, + null, new int[] {1000, 500}, + new FluidStack[] { + FluidUtils.getFluidStack("molten.li2bef4", 34), + FluidUtils.getFluidStack("molten.LiFBeF2ZrF4U235".toLowerCase(), 17) + }, + new FluidStack[] { + FluidUtils.getFluidStack("molten.uraniumhexafluoride", 2), + FluidUtils.getFluidStack("molten.uraniumhexafluoride", 1) + }, + 3000,//time + 0,//cost + 4096//fuel value + ); + + mRecipesLFTR.add(LFTR1); + mRecipesLFTR.add(LFTR2); + mRecipesLFTR.add(LFTR3); + + } +} |