xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-01-25 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

flixes

Browse Source
This commit is contained in:
Boblet 2023-11-07 15:59:04 +01:00
parent 2090ac553d
commit a5c49f6d64
5 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
changelog
View File

@ -1,11 +1,3 @@
## Changed
* Updated russian localization
* The wood-burning generator now burns 40mB/s instead of 1mB/s
* Buffed the wood-burning generator's efficiency for fluids from 25% to 50%
* The particle accelerator now has a new IO mode called single mode, which only allows one item per slot
* Added some color variance to the FEL's shell
## Fixed ## Fixed
* Fixed wood-burning generator being 100x more efficient than it's supposed to be * Fixed thorium bedrock ore using the wrong ore dict key, making it unable to be processed via centrifuge or acidizer
* Fixed arc welders eating infinite surplus energy * Fixed custom machine NEI slots going out of bounds after the third slot
* Fixed small wires not being crucible smeltable

4
src/main/java/com/hbm/handler/nei/CustomMachineHandler.java
View File

@ -57,7 +57,7 @@ public class CustomMachineHandler extends TemplateRecipeHandler {
for(int i = 0; i < 3; i++) if(recipe.inputFluids.length > i) inputs.add(new PositionedStack(ItemFluidIcon.make(recipe.inputFluids[i]), 12 + i * 18, 6)); for(int i = 0; i < 3; i++) if(recipe.inputFluids.length > i) inputs.add(new PositionedStack(ItemFluidIcon.make(recipe.inputFluids[i]), 12 + i * 18, 6));
for(int i = 0; i < 3; i++) if(recipe.inputItems.length > i) inputs.add(new PositionedStack(recipe.inputItems[i].extractForNEI(), 12 + i * 18, 24)); for(int i = 0; i < 3; i++) if(recipe.inputItems.length > i) inputs.add(new PositionedStack(recipe.inputItems[i].extractForNEI(), 12 + i * 18, 24));
for(int i = 3; i < 6; i++) if(recipe.inputItems.length > i) inputs.add(new PositionedStack(recipe.inputItems[i].extractForNEI(), 12 + i * 18, 42)); for(int i = 3; i < 6; i++) if(recipe.inputItems.length > i) inputs.add(new PositionedStack(recipe.inputItems[i].extractForNEI(), 12 + (i - 3) * 18, 42));
for(int i = 0; i < 3; i++) if(recipe.outputFluids.length > i) outputs.add(new PositionedStack(ItemFluidIcon.make(recipe.outputFluids[i]), 102 + i * 18, 6)); for(int i = 0; i < 3; i++) if(recipe.outputFluids.length > i) outputs.add(new PositionedStack(ItemFluidIcon.make(recipe.outputFluids[i]), 102 + i * 18, 6));
@ -76,7 +76,7 @@ public class CustomMachineHandler extends TemplateRecipeHandler {
if(pair.getValue() != 1) { if(pair.getValue() != 1) {
ItemStackUtil.addTooltipToStack(out, EnumChatFormatting.RED + "" + (((int)(pair.getValue() * 1000)) / 10D) + "%"); ItemStackUtil.addTooltipToStack(out, EnumChatFormatting.RED + "" + (((int)(pair.getValue() * 1000)) / 10D) + "%");
} }
outputs.add(new PositionedStack(out, 102 + i * 18, 42)); outputs.add(new PositionedStack(out, 102 + (i - 3) * 18, 42));
} }
this.machine = new PositionedStack(new ItemStack(ModBlocks.custom_machine, 1, 100 + CustomMachineConfigJSON.niceList.indexOf(conf)), 75, 42); this.machine = new PositionedStack(new ItemStack(ModBlocks.custom_machine, 1, 100 + CustomMachineConfigJSON.niceList.indexOf(conf)), 75, 42);

2
src/main/java/com/hbm/items/special/ItemBedrockOre.java
View File

@ -94,7 +94,7 @@ public class ItemBedrockOre extends ItemEnumMulti {
TUNGSTEN("Tungsten", 0x2C293C, B_LEAD, B_IRON, B_BISMUTH), //ferberite has iron, raspite has lead, russelite is bismuth tungsten TUNGSTEN("Tungsten", 0x2C293C, B_LEAD, B_IRON, B_BISMUTH), //ferberite has iron, raspite has lead, russelite is bismuth tungsten
GOLD("Gold", 0xF9D738, B_LEAD, B_COPPER, B_BISMUTH), //occurs with copper, lead and rare bismuthide GOLD("Gold", 0xF9D738, B_LEAD, B_COPPER, B_BISMUTH), //occurs with copper, lead and rare bismuthide
URANIUM("Uranium", 0x868D82, B_LEAD, B_RADIUM, B_POLONIUM), //uranium and its decay products URANIUM("Uranium", 0x868D82, B_LEAD, B_RADIUM, B_POLONIUM), //uranium and its decay products
THORIUM("Thorium", 0x7D401D, B_SILICON, B_URANIUM, B_TECHNETIUM), //thorium occours with uraninite and decay products THORIUM("Thorium232", 0x7D401D, B_SILICON, B_URANIUM, B_TECHNETIUM), //thorium occours with uraninite and decay products
CHLOROCALCITE("Chlorocalcite", 0xCDE036, B_LITHIUM, B_SILICON, B_SILICON), //i guess? CHLOROCALCITE("Chlorocalcite", 0xCDE036, B_LITHIUM, B_SILICON, B_SILICON), //i guess?
FLUORITE("Fluorite", 0xF6F3E7, B_SILICON, B_LITHIUM, B_ALUMINIUM), //different silicon-bearing gemstones, generic lithium, aluminium from sodium compound trailings FLUORITE("Fluorite", 0xF6F3E7, B_SILICON, B_LITHIUM, B_ALUMINIUM), //different silicon-bearing gemstones, generic lithium, aluminium from sodium compound trailings
HEMATITE("Hematite", 0xA37B72, B_SULFUR, B_TITANIUM, B_TITANIUM), //titanium, sulfur from pyrite HEMATITE("Hematite", 0xA37B72, B_SULFUR, B_TITANIUM, B_TITANIUM), //titanium, sulfur from pyrite

2
src/main/resources/assets/hbm/lang/de_DE.lang
View File

@ -2562,7 +2562,7 @@ item.ore.malachite=Malachit
item.ore.niobium=Niob item.ore.niobium=Niob
item.ore.titanium=Titan item.ore.titanium=Titan
item.ore.tungsten=Wolfram item.ore.tungsten=Wolfram
item.ore.thorium=Thorium item.ore.thorium232=Thorium
item.ore.uranium=Uran item.ore.uranium=Uran
item.ore_bedrock.name=Bedrock-%serz item.ore_bedrock.name=Bedrock-%serz
item.ore_byproduct.b_aluminium.name=Kristallines Aluminiumfragment item.ore_byproduct.b_aluminium.name=Kristallines Aluminiumfragment

2
src/main/resources/assets/hbm/lang/en_US.lang
View File

@ -3321,7 +3321,7 @@ item.ore.malachite=Malachite
item.ore.niobium=Niobium item.ore.niobium=Niobium
item.ore.titanium=Titanium item.ore.titanium=Titanium
item.ore.tungsten=Tungsten item.ore.tungsten=Tungsten
item.ore.thorium=Thorium item.ore.thorium232=Thorium
item.ore.uranium=Uranium item.ore.uranium=Uranium
item.ore_bedrock.name=%s Bedrock Ore item.ore_bedrock.name=%s Bedrock Ore
item.ore_byproduct.b_aluminium.name=Crystalline Aluminium Fragment item.ore_byproduct.b_aluminium.name=Crystalline Aluminium Fragment