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

some small fixes

Browse Source
This commit is contained in:
Boblet 2021-08-02 16:36:17 +02:00
parent 7944494d74
commit 768c5a4fde
4 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/hbm/crafting/ToolRecipes.java
View File

@ -125,7 +125,7 @@ public class ToolRecipes {
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.defuser, 1), new Object[] { " PS", "P P", " P ", 'P', "ingotPolymer", 'S', "plateSteel" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.defuser, 1), new Object[] { " PS", "P P", " P ", 'P', "ingotPolymer", 'S', "plateSteel" }));
GameRegistry.addRecipe(new ItemStack(ModItems.coltan_tool, 1), new Object[] { "ACA", "CXC", "ACA", 'A', ModItems.ingot_advanced_alloy, 'C', ModItems.cinnebar, 'X', Items.compass }); GameRegistry.addRecipe(new ItemStack(ModItems.coltan_tool, 1), new Object[] { "ACA", "CXC", "ACA", 'A', ModItems.ingot_advanced_alloy, 'C', ModItems.cinnebar, 'X', Items.compass });
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.reacher, 1), new Object[] { "BIB", "P P", "B B", 'B', ModItems.bolt_tungsten, 'I', "ingotTungsten", 'P', ModItems.plate_polymer })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.reacher, 1), new Object[] { "BIB", "P P", "B B", 'B', ModItems.bolt_tungsten, 'I', "ingotTungsten", 'P', ModItems.plate_polymer }));
GameRegistry.addRecipe(new ItemStack(ModItems.bismuth_tool, 1), new Object[] { "CTC", "BRB", "BTB", 'C', ModItems.coil_advanced_alloy, 'T', ModItems.gem_tantalium, 'B', ModItems.ingot_bismuth, 'R', ModItems.reacher }); GameRegistry.addRecipe(new ItemStack(ModItems.bismuth_tool, 1), new Object[] { "TBT", "SRS", "SCS", 'T', ModItems.nugget_tantalium, 'B', ModItems.nugget_bismuth, 'S', ModItems.ingot_tcalloy, 'R', ModItems.reacher, 'C', ModItems.circuit_aluminium });
//Bobmazon //Bobmazon
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.bobmazon_materials), new Object[] { Items.book, Items.gold_nugget, Items.string }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.bobmazon_materials), new Object[] { Items.book, Items.gold_nugget, Items.string });

4
src/main/java/com/hbm/inventory/FluidTank.java
View File

@ -122,7 +122,9 @@ public class FluidTank {
slots[in].stackSize--; slots[in].stackSize--;
if(slots[in].stackSize <= 0) if(slots[in].stackSize <= 0)
slots[in] = null; slots[in] = null;
slots[out].stackSize++;
if(FluidContainerRegistry.getEmptyContainer(slots[in]) != null)
slots[out].stackSize++;
} }
} }
} }

6
src/main/java/com/hbm/inventory/MachineRecipes.java
View File

@ -180,9 +180,9 @@ public class MachineRecipes {
return list; return list;
case WATZ: case WATZ:
list.add(new GasCentOutput(1, new ItemStack(ModItems.nugget_solinium), 1)); list.add(new GasCentOutput(1, new ItemStack(ModItems.nugget_solinium), 1));
list.add(new GasCentOutput(1, new ItemStack(ModItems.nugget_uranium), 1)); list.add(new GasCentOutput(1, new ItemStack(ModItems.nugget_uranium), 2));
list.add(new GasCentOutput(5, new ItemStack(ModItems.powder_lead), 1)); list.add(new GasCentOutput(5, new ItemStack(ModItems.powder_lead), 3));
list.add(new GasCentOutput(10, new ItemStack(ModItems.dust), 1)); list.add(new GasCentOutput(10, new ItemStack(ModItems.dust), 4));
return list; return list;
case SAS3: case SAS3:
list.add(new GasCentOutput(4, new ItemStack(ModItems.nugget_schrabidium), 1)); list.add(new GasCentOutput(4, new ItemStack(ModItems.nugget_schrabidium), 1));

35
src/main/java/com/hbm/main/ModEventHandler.java
View File

@ -371,12 +371,13 @@ public class ModEventHandler {
ItemStack cladding = mods[ArmorModHandler.cladding]; ItemStack cladding = mods[ArmorModHandler.cladding];
if(cladding != null && cladding.getItem() == ModItems.cladding_obsidian) { if(cladding != null && cladding.getItem() == ModItems.cladding_obsidian) {
ReflectionHelper.setPrivateValue(Entity.class, event.entityItem, true, "field_149500_a", "invulnerable");
try {
ReflectionHelper.findField(Entity.class, "field_149500_a", "invulnerable").setBoolean(event.entityItem, true);
} catch(Exception e) { }
} }
} }
if(yeet.getItem() == ModItems.bismuth_tool) {
ReflectionHelper.setPrivateValue(Entity.class, event.entityItem, true, "field_149500_a", "invulnerable");
}
} }
@SubscribeEvent @SubscribeEvent
@ -920,26 +921,24 @@ public class ModEventHandler {
} }
@SubscribeEvent @SubscribeEvent
public void enteringChunk(EnteringChunk evt) public void enteringChunk(EnteringChunk evt) {
{
if(evt.entity instanceof EntityMissileBaseAdvanced) if(evt.entity instanceof EntityMissileBaseAdvanced) {
{ ((EntityMissileBaseAdvanced) evt.entity).loadNeighboringChunks(evt.newChunkX, evt.newChunkZ);
((EntityMissileBaseAdvanced)evt.entity).loadNeighboringChunks(evt.newChunkX, evt.newChunkZ); }
}
if(evt.entity instanceof EntityMissileCustom) {
if(evt.entity instanceof EntityMissileCustom) ((EntityMissileCustom) evt.entity).loadNeighboringChunks(evt.newChunkX, evt.newChunkZ);
{ }
((EntityMissileCustom)evt.entity).loadNeighboringChunks(evt.newChunkX, evt.newChunkZ); }
}
}
@SubscribeEvent @SubscribeEvent
public void onPlayerClone(net.minecraftforge.event.entity.player.PlayerEvent.Clone event) { public void onPlayerClone(net.minecraftforge.event.entity.player.PlayerEvent.Clone event) {
NBTTagCompound data = new NBTTagCompound(); NBTTagCompound data = new NBTTagCompound();
HbmPlayerProps.getData(event.original).saveNBTData(data); HbmPlayerProps.getData(event.original).saveNBTData(data);
HbmPlayerProps.getData(event.entityPlayer).loadNBTData(data); HbmPlayerProps.getData(event.entityPlayer).loadNBTData(data);
} }
@SubscribeEvent @SubscribeEvent
public void itemCrafted(PlayerEvent.ItemCraftedEvent e) { public void itemCrafted(PlayerEvent.ItemCraftedEvent e) {