Skip to content

Commit

Permalink
Merge pull request #14 from GTNewHorizons/nhify-spotless-fixes
Browse files Browse the repository at this point in the history
Spotless apply for branch nhify for #13
  • Loading branch information
glowredman authored May 13, 2023
2 parents 2da6b88 + 31b7073 commit 0491d34
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 12 deletions.
7 changes: 3 additions & 4 deletions src/main/java/de/katzenpapst/amunra/AmunRa.java
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,7 @@
@Mod(
modid = AmunRa.MODID,
version = AmunRa.VERSION,
dependencies = "required-after:GalacticraftCore@[3.0.61-GTNH,);"
+ "required-after:GalacticraftMars;"
dependencies = "required-after:GalacticraftCore@[3.0.61-GTNH,);" + "required-after:GalacticraftMars;"
+ "after:dreamcraft;"
+ "after:IronChest;"
+ "after:AdvancedSolarPanel",
Expand Down Expand Up @@ -161,7 +160,7 @@ public class AmunRa {

protected ArrayList<ResourceLocation> possibleMothershipTextures = new ArrayList<>();
protected ArrayList<ResourceLocation> possibleAsteroidTextures = new ArrayList<>();

public static boolean isNHCoreLoaded;
public static boolean isIronChestsLoaded;
public static boolean isASPLoaded;
Expand All @@ -178,7 +177,7 @@ public void preInit(final FMLPreInitializationEvent event) {
isNHCoreLoaded = Loader.isModLoaded("dreamcraft");
isIronChestsLoaded = Loader.isModLoaded("IronChest");
isASPLoaded = Loader.isModLoaded("AdvancedSolarPanel");

final Configuration configFile = new Configuration(event.getSuggestedConfigurationFile());

config.processConfig(configFile);
Expand Down
16 changes: 8 additions & 8 deletions src/main/java/de/katzenpapst/amunra/crafting/RecipeHelper.java
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ public class RecipeHelper {
public RecipeHelper() {}

public static void initRecipes() {

initNasaWorkbenchCrafting();
if(!AmunRa.isNHCoreLoaded) {

if (!AmunRa.isNHCoreLoaded) {
return;
}

Expand Down Expand Up @@ -917,9 +917,9 @@ private static void initNasaWorkbenchCrafting() {
// Schematic
final HashMap<Integer, ItemStack> input = new HashMap<>();

if(AmunRa.isNHCoreLoaded && AmunRa.isASPLoaded) {
if (AmunRa.isNHCoreLoaded && AmunRa.isASPLoaded) {
final ItemStack fins = GameRegistry.findItemStack("dreamcraft", "item.HeavyDutyRocketFinsTier4", 1);

// top row, single slot
input.put(1, ARItems.noseCone.getItemStack(1));
// body
Expand Down Expand Up @@ -1038,7 +1038,7 @@ private static void addSlabAndStairsCrafting(final BlockMetaPair block, final Bl
/**
* adds a crafting recipe for a gun and reloading recipes
*
* @param recipe the very last argument must be the battery
* @param recipe the very last argument must be the battery
*/
private static void addRaygunRecipe(final ItemStack gun, final ItemStack[] batteries, final Object... recipe) {
// TODO find a way to display what is actually being crafted
Expand Down Expand Up @@ -1082,8 +1082,8 @@ public static void addRocketRecipeWithChestPermutations(final Item rocket,

ItemStack chest;
final ItemStack tank = ARItems.shuttleTank.getItemStack(1);
if(AmunRa.isIronChestsLoaded) {

if (AmunRa.isIronChestsLoaded) {
// Copper Chest
chest = GameRegistry.findItemStack("IronChest", "BlockIronChest", 1);
Items.apple.setDamage(chest, 3);
Expand Down

0 comments on commit 0491d34

Please sign in to comment.