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

fix, nix, nyx, dyx

Browse Source
This commit is contained in:
Boblet 2023-02-21 16:45:59 +01:00
parent a7e51e6059
commit cfa87c084c
13 changed files with 91 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/hbm/blocks/machine/MachineRefinery.java
View File

@ -33,6 +33,7 @@ import net.minecraft.util.EnumChatFormatting;
import net.minecraft.world.Explosion;
import net.minecraft.world.World;
import net.minecraftforge.client.event.RenderGameOverlayEvent.Pre;
import net.minecraftforge.common.util.ForgeDirection;
public class MachineRefinery extends BlockDummyable implements IPersistentInfoProvider, IToolable, ILookOverlay {
@ -69,6 +70,16 @@ public class MachineRefinery extends BlockDummyable implements IPersistentInfoPr
}
}
@Override
protected void fillSpace(World world, int x, int y, int z, ForgeDirection dir, int o) {
super.fillSpace(world, x, y, z, dir, o);
this.makeExtra(world, x - dir.offsetX + 1, y, z - dir.offsetZ + 1);
this.makeExtra(world, x - dir.offsetX + 1, y, z - dir.offsetZ - 1);
this.makeExtra(world, x - dir.offsetX - 1, y, z - dir.offsetZ + 1);
this.makeExtra(world, x - dir.offsetX - 1, y, z - dir.offsetZ - 1);
}
@Override
public int[] getDimensions() {
return new int[] {8, 0, 1, 1, 1, 1};

2
src/main/java/com/hbm/handler/GunConfiguration.java
View File

@ -34,7 +34,7 @@ public class GunConfiguration implements Cloneable {
//animations!
public HashMap<AnimType, BusAnimation> animations = new HashMap();
//whether or not to disable crosshair when sneaking
//when sneaking, disables crosshair and centers the bullet spawn point
public boolean hasSights;
//texture overlay when sneaking
public ResourceLocation scopeTexture;

12
src/main/java/com/hbm/handler/guncfg/Gun44MagnumFactory.java
View File

@ -93,6 +93,7 @@ public class Gun44MagnumFactory {
config.manufacturer = EnumGunManufacturer.IF;
config.comment.add("Poppin' mentats like tic tacs");
config.allowsInfinity = false;
config.hasSights = true;
config.absoluteFOV = true;
config.zoomFOV = 0.25F;
@ -111,7 +112,8 @@ public class Gun44MagnumFactory {
config.durability = 4000;
config.ammoCap = 5;
config.allowsInfinity = false;
config.name = "ifVanity";
config.manufacturer = EnumGunManufacturer.IF;
config.comment.add("Alcoholism is cool!");
@ -131,7 +133,8 @@ public class Gun44MagnumFactory {
config.durability = 4000;
config.ammoCap = 6;
config.allowsInfinity = false;
config.name = "ifStorm";
config.manufacturer = EnumGunManufacturer.IF;
config.comment.add("Our friendship is based on abusive behaviour");
@ -149,8 +152,9 @@ public class Gun44MagnumFactory {
GunConfiguration config = getBaseConfig();
config.durability = 4000;
config.ammoCap = 64;
config.ammoCap = 8;
config.allowsInfinity = false;
config.name = "ifPit";
config.manufacturer = EnumGunManufacturer.IF;
config.comment.add("Explore the other side");

1
src/main/java/com/hbm/handler/guncfg/GunGrenadeFactory.java
View File

@ -35,6 +35,7 @@ public class GunGrenadeFactory {
config.gunMode = GunConfiguration.MODE_NORMAL;
config.firingMode = GunConfiguration.FIRE_MANUAL;
config.hasSights = true;
config.zoomFOV = 0.66F;
config.reloadDuration = 40;
config.firingDuration = 0;
config.ammoCap = 1;

2
src/main/java/com/hbm/inventory/fluid/Fluids.java
View File

@ -217,7 +217,7 @@ public class Fluids {
NITRIC_ACID = new FluidType("NITRIC_ACID", 0xBB7A1E, 3, 0, 2, EnumSymbol.OXIDIZER).addTraits(LIQUID, new FT_Corrosive(60));
SOLVENT = new FluidType("SOLVENT", 0xE4E3EF, 2, 3, 0, EnumSymbol.NONE).addContainers(0xE4E3EF, ExtContainer.CANISTER).addTraits(LIQUID);
BLOOD = new FluidType("BLOOD", 0xB22424, 0, 0, 0, EnumSymbol.NONE).addTraits(LIQUID);
BLOOD_HOT = new FluidType("BLOOD_HOT", 0xE4E3EF, 3, 0, 0, EnumSymbol.NONE).addTraits(LIQUID).setTemp(666); //it's funny because it's the satan number
BLOOD_HOT = new FluidType("BLOOD_HOT", 0xF22419, 3, 0, 0, EnumSymbol.NONE).addTraits(LIQUID).setTemp(666); //it's funny because it's the satan number
SYNGAS = new FluidType("SYNGAS", 0x131313, 1, 4, 2, EnumSymbol.NONE).addTraits(GASEOUS);
OXYHYDROGEN = new FluidType(87, "OXYHYDROGEN", 0x483FC1, 0, 4, 2, EnumSymbol.NONE).addTraits(GASEOUS);

5
src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java
View File

@ -920,9 +920,10 @@ public class AssemblerRecipes {
makeRecipe(new ComparableStack(ModBlocks.machine_hephaestus, 1), new AStack[] {
new ComparableStack(ModItems.pipes_steel, 1),
new OreDictStack(STEEL.ingot(), 12),
new OreDictStack(STEEL.ingot(), 24),
new OreDictStack(CU.plate(), 24),
new OreDictStack(RUBBER.ingot(), 8),
new OreDictStack(NB.ingot(), 4),
new OreDictStack(RUBBER.ingot(), 12),
new ComparableStack(ModBlocks.glass_quartz, 16)
}, 150);

5
src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java
View File

@ -339,9 +339,10 @@ public class AnvilRecipes {
constructionRecipes.add(new AnvilConstructionRecipe(
new AStack[] {
new OreDictStack(STEEL.plate(), 12),
new OreDictStack(IRON.ingot(), 8),
new OreDictStack(STEEL.plate(), 4),
new OreDictStack(IRON.ingot(), 12),
new OreDictStack(CU.ingot(), 2),
new ComparableStack(ModItems.circuit_aluminium),
new ComparableStack(ModItems.sawblade)
}, new AnvilOutput(new ItemStack(ModBlocks.machine_autosaw))).setTier(2));

11
src/main/java/com/hbm/tileentity/machine/TileEntityMachineAssemfac.java
View File

@ -11,6 +11,7 @@ import com.hbm.inventory.UpgradeManager;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.inventory.fluid.tank.FluidTank;
import com.hbm.items.machine.ItemMachineUpgrade;
import com.hbm.items.machine.ItemMachineUpgrade.UpgradeType;
import com.hbm.lib.Library;
import com.hbm.util.fauxpointtwelve.DirPos;
@ -18,6 +19,7 @@ import com.hbm.util.fauxpointtwelve.DirPos;
import api.hbm.fluid.IFluidStandardTransceiver;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.ChunkCoordinates;
@ -47,6 +49,15 @@ public class TileEntityMachineAssemfac extends TileEntityMachineAssemblerBase im
return "container.assemfac";
}
@Override
public void setInventorySlotContents(int i, ItemStack stack) {
super.setInventorySlotContents(i, stack);
if(stack != null && i >= 1 && i <= 4 && stack.getItem() instanceof ItemMachineUpgrade) {
worldObj.playSoundEffect(xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, "hbm:item.upgradePlug", 1.0F, 1.0F);
}
}
@Override
public void updateEntity() {
super.updateEntity();

11
src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemfac.java
View File

@ -11,12 +11,14 @@ import com.hbm.inventory.UpgradeManager;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.inventory.fluid.tank.FluidTank;
import com.hbm.items.machine.ItemMachineUpgrade;
import com.hbm.items.machine.ItemMachineUpgrade.UpgradeType;
import com.hbm.lib.Library;
import com.hbm.util.fauxpointtwelve.DirPos;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.ChunkCoordinates;
@ -38,6 +40,15 @@ public class TileEntityMachineChemfac extends TileEntityMachineChemplantBase {
steam = new FluidTank(Fluids.SPENTSTEAM, 64_000, tanks.length + 1);
}
@Override
public void setInventorySlotContents(int i, ItemStack stack) {
super.setInventorySlotContents(i, stack);
if(stack != null && i >= 1 && i <= 4 && stack.getItem() instanceof ItemMachineUpgrade) {
worldObj.playSoundEffect(xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, "hbm:item.upgradePlug", 1.0F, 1.0F);
}
}
@Override
public void updateEntity() {
super.updateEntity();

27
src/main/java/com/hbm/tileentity/machine/TileEntityMachineCrystallizer.java
View File

@ -2,7 +2,6 @@ package com.hbm.tileentity.machine;
import com.hbm.blocks.BlockDummyable;
import com.hbm.interfaces.IFluidAcceptor;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.inventory.fluid.tank.FluidTank;
import com.hbm.inventory.recipes.CrystallizerRecipes;
@ -24,7 +23,7 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB;
import net.minecraftforge.common.util.ForgeDirection;
public class TileEntityMachineCrystallizer extends TileEntityMachineBase implements IEnergyUser, IFluidAcceptor, IFluidStandardReceiver {
public class TileEntityMachineCrystallizer extends TileEntityMachineBase implements IEnergyUser, IFluidStandardReceiver {
public long power;
public static final long maxPower = 1000000;
@ -283,24 +282,6 @@ public class TileEntityMachineCrystallizer extends TileEntityMachineBase impleme
return (progress * i) / duration;
}
@Override public void setFillForSync(int fill, int index) { }
@Override public void setTypeForSync(FluidType type, int index) { }
@Override
public void setFluidFill(int fill, FluidType type) {
tank.setFill(fill);
}
@Override
public int getFluidFill(FluidType type) {
return tank.getFill();
}
@Override
public int getMaxFluidFill(FluidType type) {
return tank.getMaxFill();
}
@Override
public void setPower(long i) {
this.power = i;
@ -364,8 +345,7 @@ public class TileEntityMachineCrystallizer extends TileEntityMachineBase impleme
@Override
@SideOnly(Side.CLIENT)
public double getMaxRenderDistanceSquared()
{
public double getMaxRenderDistanceSquared() {
return 65536.0D;
}
@ -373,8 +353,9 @@ public class TileEntityMachineCrystallizer extends TileEntityMachineBase impleme
public void setInventorySlotContents(int i, ItemStack stack) {
super.setInventorySlotContents(i, stack);
if(stack != null && i >= 5 && i <= 6 && stack.getItem() instanceof ItemMachineUpgrade)
if(stack != null && i >= 5 && i <= 6 && stack.getItem() instanceof ItemMachineUpgrade) {
worldObj.playSoundEffect(xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, "hbm:item.upgradePlug", 1.0F, 1.0F);
}
}
@Override

22
src/main/java/com/hbm/tileentity/machine/TileEntityMachineHephaestus.java
View File

@ -141,12 +141,12 @@ public class TileEntityMachineHephaestus extends TileEntityLoadedBase implements
protected int heatFromBlock(int x, int y, int z) {
Block b = worldObj.getBlock(x, y, z);
if(b == Blocks.lava || b == Blocks.flowing_lava) return 25;
if(b == ModBlocks.volcanic_lava_block) return 500;
if(b == Blocks.lava || b == Blocks.flowing_lava) return 5;
if(b == ModBlocks.volcanic_lava_block) return 150;
if(b == ModBlocks.ore_volcano) {
this.fissureScanTime = worldObj.getTotalWorldTime();
return 1_000;
return 300;
}
return 0;
@ -197,6 +197,22 @@ public class TileEntityMachineHephaestus extends TileEntityLoadedBase implements
new DirPos(xCoord, yCoord + 11, zCoord - 2, Library.NEG_Z)
};
}
@Override
public void readFromNBT(NBTTagCompound nbt) {
super.readFromNBT(nbt);
this.input.readFromNBT(nbt, "0");
this.output.readFromNBT(nbt, "1");
}
@Override
public void writeToNBT(NBTTagCompound nbt) {
super.writeToNBT(nbt);
this.input.writeToNBT(nbt, "0");
this.output.writeToNBT(nbt, "1");
}
@Override
public FluidTank[] getAllTanks() {

7
src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineRefinery.java
View File

@ -133,7 +133,7 @@ public class TileEntityMachineRefinery extends TileEntityMachineBase implements
if(this.getBlockMetadata() < 12) {
ForgeDirection dir = ForgeDirection.getOrientation(this.getBlockMetadata()).getRotation(ForgeDirection.DOWN);
worldObj.removeTileEntity(xCoord, yCoord, zCoord);
worldObj.setBlock(xCoord, yCoord, zCoord, ModBlocks.machine_fluidtank, dir.ordinal() + 10, 3);
worldObj.setBlock(xCoord, yCoord, zCoord, ModBlocks.machine_refinery, dir.ordinal() + 10, 3);
MultiblockHandlerXR.fillSpace(worldObj, xCoord, yCoord, zCoord, ((BlockDummyable) ModBlocks.machine_refinery).getDimensions(), ModBlocks.machine_refinery, dir);
NBTTagCompound data = new NBTTagCompound();
this.writeToNBT(data);
@ -423,6 +423,11 @@ public class TileEntityMachineRefinery extends TileEntityMachineBase implements
return tanks;
}
@Override
public boolean canConnect(FluidType type, ForgeDirection dir) {
return dir != ForgeDirection.UNKNOWN && dir != ForgeDirection.DOWN;
}
@Override
public void explode(World world, int x, int y, int z) {

12
src/main/java/com/hbm/tileentity/network/TileEntityCraneExtractor.java
View File

@ -41,6 +41,18 @@ public class TileEntityCraneExtractor extends TileEntityMachineBase implements I
return "container.craneExtractor";
}
@Override
public void setInventorySlotContents(int i, ItemStack stack) {
super.setInventorySlotContents(i, stack);
if(stack != null) {
if((stack.getItem() == ModItems.upgrade_ejector && i == 19) || (stack.getItem() == ModItems.upgrade_stack && i == 18)) {
worldObj.playSoundEffect(xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, "hbm:item.upgradePlug", 1.0F, 1.0F);
}
}
}
@Override
public void updateEntity() {