mirror of
https://github.com/GTNewHorizons/Eternal-Singularity.git
synced 2026-11-21 20:42:21 +00:00
[ci skip] spotlessApply with the new settings
This commit is contained in:
1 parent
a7f07e0b6c
commit
67b6b1ed0f
11 files changed
+92
-56
No files matched your search
@@ -2,24 +2,28 @@ package singulariteam.eternalsingularity.proxy;
|
||||
|
||||
import static fox.spiteful.avaritia.Config.craftingOnly;
|
||||
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import fox.spiteful.avaritia.crafting.ExtremeCraftingManager;
|
||||
import fox.spiteful.avaritia.crafting.Grinder;
|
||||
import java.io.File;
|
||||
import java.util.*;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.MathHelper;
|
||||
import net.minecraftforge.common.config.Configuration;
|
||||
import net.minecraftforge.oredict.ShapelessOreRecipe;
|
||||
|
||||
import singulariteam.eternalsingularity.EternalRecipeTweaker;
|
||||
import singulariteam.eternalsingularity.EternalSingularityMod;
|
||||
import singulariteam.eternalsingularity.item.CompoundSingularityItem;
|
||||
import singulariteam.eternalsingularity.item.EternalSingularityItem;
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import fox.spiteful.avaritia.crafting.ExtremeCraftingManager;
|
||||
import fox.spiteful.avaritia.crafting.Grinder;
|
||||
|
||||
public class CommonProxy {
|
||||
|
||||
private static ShapelessOreRecipe eternalSingularityRecipe = null;
|
||||
private static final Set<Class> classSet = new HashSet<>();
|
||||
protected CompoundSingularityItem compoundSingularityItem = null;
|
||||
@@ -32,12 +36,9 @@ public class CommonProxy {
|
||||
final String[] classNameList = config.getStringList(
|
||||
"classNameList",
|
||||
Configuration.CATEGORY_GENERAL,
|
||||
new String[] {
|
||||
"com.rcx.aobdsingularities.item.AOBDItemSingularity",
|
||||
"fox.spiteful.avaritia.items.ItemSingularity",
|
||||
"wanion.thermsingul.ThermalSingularityItem",
|
||||
"wealthyturtle.uiesingularities.UniversalSingularityItem"
|
||||
},
|
||||
new String[] { "com.rcx.aobdsingularities.item.AOBDItemSingularity",
|
||||
"fox.spiteful.avaritia.items.ItemSingularity", "wanion.thermsingul.ThermalSingularityItem",
|
||||
"wealthyturtle.uiesingularities.UniversalSingularityItem" },
|
||||
"here is the absolute class name of the Item Classes that must be removed from Infinity Catalyst recipe and inserted into Eternal Singularity.");
|
||||
if (config.hasChanged()) config.save();
|
||||
for (final String className : classNameList) {
|
||||
@@ -62,9 +63,8 @@ public class CommonProxy {
|
||||
public void postInit() {
|
||||
if (classSet.isEmpty() || craftingOnly) return;
|
||||
final List<ItemStack> singularities = new ArrayList<>();
|
||||
for (final Iterator<Object> catalystRecipeIterator =
|
||||
Grinder.catalyst.getInput().iterator();
|
||||
catalystRecipeIterator.hasNext(); ) {
|
||||
for (final Iterator<Object> catalystRecipeIterator = Grinder.catalyst.getInput()
|
||||
.iterator(); catalystRecipeIterator.hasNext();) {
|
||||
final Object input = catalystRecipeIterator.next();
|
||||
if (!(input instanceof ItemStack)) continue;
|
||||
final Item item = ((ItemStack) input).getItem();
|
||||
@@ -77,10 +77,10 @@ public class CommonProxy {
|
||||
final int singularityCount = singularities.size();
|
||||
final boolean aboveTheLimit = singularityCount > 81;
|
||||
final boolean useCompoundSingularities = config.getBoolean(
|
||||
"useCompoundSingularities",
|
||||
Configuration.CATEGORY_GENERAL,
|
||||
aboveTheLimit,
|
||||
"When useCompoundSingularities is Enabled, Basic Singularities will Need to be Crafted into Compound Singularities First.\n[If there are > 81 Basic Singularities, this Config Option will be Set to True Automatically]")
|
||||
"useCompoundSingularities",
|
||||
Configuration.CATEGORY_GENERAL,
|
||||
aboveTheLimit,
|
||||
"When useCompoundSingularities is Enabled, Basic Singularities will Need to be Crafted into Compound Singularities First.\n[If there are > 81 Basic Singularities, this Config Option will be Set to True Automatically]")
|
||||
|| aboveTheLimit;
|
||||
final boolean easyMode = config.getBoolean(
|
||||
"easyMode",
|
||||
@@ -89,13 +89,14 @@ public class CommonProxy {
|
||||
"If this Config Option is Enabled, for Every 9 Singularities Used in the Eternal Singularity Recipe, You will Receive an Additional Eternal Singularity for the Recipe Output.");
|
||||
if (config.hasChanged()) config.save();
|
||||
final int compoundMax = 16;
|
||||
(eternalSingularityRecipe = new ShapelessOreRecipe(new ItemStack(
|
||||
EternalSingularityItem.instance, easyMode ? MathHelper.clamp_int(compoundMax, 1, 64) : 1)))
|
||||
.getInput()
|
||||
.addAll(singularities);
|
||||
(eternalSingularityRecipe = new ShapelessOreRecipe(
|
||||
new ItemStack(
|
||||
EternalSingularityItem.instance,
|
||||
easyMode ? MathHelper.clamp_int(compoundMax, 1, 64) : 1))).getInput().addAll(singularities);
|
||||
if (useCompoundSingularities) {
|
||||
GameRegistry.registerItem(
|
||||
compoundSingularityItem = new CompoundSingularityItem(compoundMax), "combined_singularity");
|
||||
compoundSingularityItem = new CompoundSingularityItem(compoundMax),
|
||||
"combined_singularity");
|
||||
final List<Object> eternalSingularityRecipeInputs = eternalSingularityRecipe.getInput();
|
||||
for (int i = 0; i < compoundMax; i++) {
|
||||
final ShapelessOreRecipe compoundRecipe = new ShapelessOreRecipe(
|
||||
|
||||
Reference in new issue
Block a user