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

Merge branch 'HbmMods:master' into master

Browse Source
This commit is contained in:
Doctor17-git 2023-04-07 19:21:52 +03:00 committed by GitHub
commit 43f3d0115c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/hbm/blocks/network/CraneBoxer.java
View File

@ -2,7 +2,6 @@ package com.hbm.blocks.network;
import com.hbm.lib.RefStrings;
import com.hbm.tileentity.network.TileEntityCraneBoxer;
import com.hbm.tileentity.network.TileEntityCraneInserter;
import api.hbm.conveyor.IConveyorItem;
import api.hbm.conveyor.IConveyorPackage;
@ -81,7 +80,7 @@ public class CraneBoxer extends BlockCraneBase implements IEnterableBlock {
@Override
public int getComparatorInputOverride(World world, int x, int y, int z, int side) {
return Container.calcRedstoneFromInventory((TileEntityCraneInserter)world.getTileEntity(x, y, z));
return Container.calcRedstoneFromInventory((TileEntityCraneBoxer)world.getTileEntity(x, y, z));
}
@Override

11
src/main/java/com/hbm/blocks/network/CraneUnboxer.java
View File

@ -12,6 +12,7 @@ import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.inventory.Container;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockAccess;
@ -86,4 +87,14 @@ public class CraneUnboxer extends BlockCraneBase implements IEnterableBlock {
}
}
}
@Override
public boolean hasComparatorInputOverride() {
return true;
}
@Override
public int getComparatorInputOverride(World world, int x, int y, int z, int side) {
return Container.calcRedstoneFromInventory((TileEntityCraneUnboxer)world.getTileEntity(x, y, z));
}
}

2
src/main/java/com/hbm/inventory/SlotCraftingOutput.java
View File

@ -31,7 +31,7 @@ public class SlotCraftingOutput extends Slot {
if(item == Item.getItemFromBlock(ModBlocks.machine_chemplant))
player.triggerAchievement(MainRegistry.achChemplant);
if(item == Item.getItemFromBlock(ModBlocks.concrete) || item == Item.getItemFromBlock(ModBlocks.concrete_asbestos))
if(item == Item.getItemFromBlock(ModBlocks.concrete_smooth) || item == Item.getItemFromBlock(ModBlocks.concrete_asbestos))
player.triggerAchievement(MainRegistry.achConcrete);
if(item == ModItems.ingot_polymer)
player.triggerAchievement(MainRegistry.achPolymer);

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

@ -38,6 +38,7 @@ import com.hbm.handler.EntityEffectHandler;
import com.hbm.hazard.HazardSystem;
import com.hbm.interfaces.IBomb;
import com.hbm.handler.HTTPHandler;
import com.hbm.handler.HbmKeybinds.EnumKeybind;
import com.hbm.handler.SiegeOrchestrator;
import com.hbm.items.IEquipReceiver;
import com.hbm.items.ModItems;
@ -72,6 +73,7 @@ import com.hbm.world.generator.TimedGenerator;
import cpw.mods.fml.common.eventhandler.EventPriority;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.PlayerEvent;
import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerChangedDimensionEvent;
import cpw.mods.fml.common.gameevent.TickEvent;
import cpw.mods.fml.common.gameevent.TickEvent.Phase;
import cpw.mods.fml.common.gameevent.TickEvent.WorldTickEvent;
@ -190,7 +192,7 @@ public class ModEventHandler {
}
@SubscribeEvent
public void onEntityConstructing(EntityEvent.EntityConstructing event) {
public void onEntityConstructing(EntityEvent.EntityConstructing event) {
if(event.entity instanceof EntityPlayer) {
@ -207,6 +209,14 @@ public class ModEventHandler {
HbmLivingProps.getData(living); //ditto
}
}
@SubscribeEvent
public void onPlayerChaangeDimension(PlayerChangedDimensionEvent event) {
EntityPlayer player = event.player;
HbmPlayerProps data = HbmPlayerProps.getData(player);
data.setKeyPressed(EnumKeybind.JETPACK, false);
data.setKeyPressed(EnumKeybind.DASH, false);
}
@SubscribeEvent(priority = EventPriority.HIGHEST)
public void onEntityDeathFirst(LivingDeathEvent event) {

4
src/main/java/com/hbm/tileentity/machine/TileEntityMachineMixer.java
View File

@ -145,8 +145,8 @@ public class TileEntityMachineMixer extends TileEntityMachineBase implements INB
if(recipe == null) return false;
tanks[0].setTankType(recipe.input1.type);
tanks[1].setTankType(recipe.input2.type);
tanks[0].setTankType(recipe.input1 != null ? recipe.input1.type : Fluids.NONE);
tanks[1].setTankType(recipe.input2 != null ? recipe.input2.type : Fluids.NONE);
if(recipe.input1 != null && tanks[0].getFill() < recipe.input1.fill) return false;
if(recipe.input2 != null && tanks[1].getFill() < recipe.input2.fill) return false;

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

@ -26,8 +26,8 @@ achievement.c20_5.desc=???
achievement.c20_5=Chapter [TWENTY POINT FIVE]
achievement.c44.desc=Galvanized! I mean, zinc!
achievement.c44=Chapter 44
achievement.centrifuge.desc=centrifugal force is fake don't @ me
achievement.centrifuge=Centripetal Force
achievement.centrifuge.desc=centrifugal force is real don't @ me
achievement.centrifuge=Centrifugal Force
achievement.chemplant.desc=Now you're thinking with chemicals!
achievement.chemplant=The Factory Grows Pt. 2
achievement.chicagoPile.desc="How were the natives?" / "Very friendly."