Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed something related to coolant cells #55

Open
wants to merge 4 commits into
base: 1.12-3.x.x
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/main/java/frogcraftrebirth/common/FrogRecipes.java
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,9 @@ public static void postInit() {
Recipes.advRecipes.addRecipe(new ItemStack(FrogGameObjects.AMMONIA_COOLANT_60K), " T ", "TCT", " T ", 'T', "plateTin", 'C', FluidRegistry.getFluidStack("ammonia", 1000));
Recipes.advRecipes.addRecipe(new ItemStack(FrogGameObjects.JINKELA), "KKK", "PPP", "NNN", 'K', new ItemStack(FrogGameObjects.POTASSIUM), 'P', new ItemStack(FrogGameObjects.PHOSPHORUS), 'N', FluidRegistry.getFluidStack("nitrogen", 1000));

Recipes.macerator.addRecipe(Recipes.inputFactory.forStack(new ItemStack(FrogGameObjects.CARNALLITE)), null, false, new ItemStack(FrogGameObjects.CRUSHED_CARNALLITE_ORE, 3, 0));
Recipes.macerator.addRecipe(Recipes.inputFactory.forStack(new ItemStack(FrogGameObjects.DEWALQUITE)), null, false, new ItemStack(FrogGameObjects.CRUSHED_DEWALQUITE_ORE, 3, 1));
Recipes.macerator.addRecipe(Recipes.inputFactory.forStack(new ItemStack(FrogGameObjects.FLUORAPATITE)), null, false, new ItemStack(FrogGameObjects.CRUSHED_FLUORAPATITE_ORE, 3, 2));
Recipes.macerator.addRecipe(Recipes.inputFactory.forStack(new ItemStack(FrogGameObjects.CARNALLITE)), null, false, new ItemStack(FrogGameObjects.CRUSHED_CARNALLITE_ORE, 3));
Recipes.macerator.addRecipe(Recipes.inputFactory.forStack(new ItemStack(FrogGameObjects.DEWALQUITE)), null, false, new ItemStack(FrogGameObjects.CRUSHED_DEWALQUITE_ORE, 3));
Recipes.macerator.addRecipe(Recipes.inputFactory.forStack(new ItemStack(FrogGameObjects.FLUORAPATITE)), null, false, new ItemStack(FrogGameObjects.CRUSHED_FLUORAPATITE_ORE, 3));
Recipes.macerator.addRecipe(Recipes.inputFactory.forOreDict("ingotAluminium"), null, false, new ItemStack(FrogGameObjects.ALUMINIUM_DUST));
Recipes.macerator.addRecipe(Recipes.inputFactory.forOreDict("ingotMagnalium"), null, false, new ItemStack(FrogGameObjects.MAGNALIUM_DUST));
Recipes.macerator.addRecipe(Recipes.inputFactory.forOreDict("ingotTitanium"), null, false, new ItemStack(FrogGameObjects.TITANIUM_DUST));
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/frogcraftrebirth/common/FrogRegistries.java
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,9 @@ public static void regItem(RegistryEvent.Register<Item> event) {
new ItemFrogBlock(FrogGameObjects.CONDENSE_TOWER_CYLINDER).setRegistryName("condense_tower_cylinder"),
new ItemFrogBlock(FrogGameObjects.CONDENSE_TOWER_OUTLET).setRegistryName("condense_tower_outlet"),
new ItemMPS((BlockMPS) FrogGameObjects.MPS).setRegistryName("mobile_power_station"),
new ItemAmmoniaCoolant("60k", 6000).setRegistryName("ammonia_coolant_60k"),
new ItemAmmoniaCoolant("180k", 18000).setRegistryName("ammonia_coolant_180k"),
new ItemAmmoniaCoolant("360k", 36000).setRegistryName("ammonia_coolant_360k"),
new ItemAmmoniaCoolant("60k", 60000).setRegistryName("ammonia_coolant_60k"),
new ItemAmmoniaCoolant("180k", 180000).setRegistryName("ammonia_coolant_180k"),
new ItemAmmoniaCoolant("360k", 360000).setRegistryName("ammonia_coolant_360k"),
new ItemDecayBattery().setTranslationKey("uranium_decay_battery").setRegistryName("uranium_decay_battery"),
new ItemDecayBattery().setTranslationKey("thorium_decay_battery").setRegistryName("thorium_decay_battery"),
new ItemDecayBattery().setTranslationKey("plutonium_decay_battery").setRegistryName("plutonium_decay_battery"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public ItemAmmoniaCoolant(String type, int storage) {
super();
this.heatStorage = storage;
this.setTranslationKey("frogcraftrebirth.ammonia_coolant." + type);
this.setMaxDamage(10000);
this.setMaxDamage(storage);
}

@Override
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/assets/frogcraftrebirth/lang/en_us.lang
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,8 @@ fluid.carbon_dioxide=Carbon Dioxide
fluid.carbon_dioxide.info=CO₂
fluid.carbon_oxide=Carbon Monoxide
fluid.carbon_oxide.info=CO
fluid.chlorine=Chlorine
fluid.chlorine.info=Cl
fluid.coal_tar=Coal Tar
fluid.coal_tar.info=What the hell does it contain?!
fluid.fluorine=Fluorine
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
}
],
"result": {
"item": "frogcraftrebirth:ammonia_coolant_180k",
"item": "frogcraftrebirth:ammonia_coolant_360k",
"data": 0
},
"group": "frogcraftrebirth:coolant",
Expand Down