fixed strandcaster UV

This commit is contained in:
Bob 2024-01-14 20:02:31 +01:00
parent 9eb4cbe6c9
commit 6b885274a9
15 changed files with 1107 additions and 816 deletions

View File

@ -1,6 +1,8 @@
## Added ## Added
* Large Radar * Large Radar
* A giant version of the radar with 3x the scan range * A giant version of the radar with 3x the scan range
* Strand caster
* Watercooled foundry basin that processes large amounts of material at once
## Changed ## Changed
* Nuclear craters have been reworked * Nuclear craters have been reworked
@ -23,7 +25,8 @@
* Trenchmaster general damage multiplier has been halved, making it twice as strong * Trenchmaster general damage multiplier has been halved, making it twice as strong
* Updated generation rules for layers like schist and hematite, they will now only replace things tagged as stone, just like most ores * Updated generation rules for layers like schist and hematite, they will now only replace things tagged as stone, just like most ores
* Mushroom clouds now have two additional outer condensation rings, those are not entirely finished and are still subject to change * Mushroom clouds now have two additional outer condensation rings, those are not entirely finished and are still subject to change
* Small radars are now a tad cheaper * Small radars are now a lot cheaper
* Increased crucible pouring speed by 50%
## Fixed ## Fixed
* Fixed a rare crash caused by radars force-loading chunks conflicting with certain mods' chunk loading changes * Fixed a rare crash caused by radars force-loading chunks conflicting with certain mods' chunk loading changes
@ -32,3 +35,5 @@
* Fixed large thermobaric artillery rocket still using the wrong slag block * Fixed large thermobaric artillery rocket still using the wrong slag block
* Fixed some of the assembly templates having broken names due to using the wrong way of translating the output * Fixed some of the assembly templates having broken names due to using the wrong way of translating the output
* Fixed the soyuz launcher's NEI construction recipe showing the wrong amount of blocks * Fixed the soyuz launcher's NEI construction recipe showing the wrong amount of blocks
* Fixed molten meteorite cobble dropping itself in addition to turning into lava
* Fixed S~Cola RAD not being radish-colored

View File

@ -1,6 +1,6 @@
mod_version=1.0.27 mod_version=1.0.27
# Empty build number makes a release type # Empty build number makes a release type
mod_build_number=4837 mod_build_number=4844
credits=HbMinecraft, rodolphito (explosion algorithms), grangerave (explosion algorithms),\ credits=HbMinecraft, rodolphito (explosion algorithms), grangerave (explosion algorithms),\
\ Hoboy (textures, models), Doctor17 (russian localization), Drillgon200 (effects, models,\ \ Hoboy (textures, models), Doctor17 (russian localization), Drillgon200 (effects, models,\

View File

@ -205,6 +205,9 @@ public class BlockOre extends Block {
if(this == ModBlocks.ore_cobalt || this == ModBlocks.ore_nether_cobalt) { if(this == ModBlocks.ore_cobalt || this == ModBlocks.ore_nether_cobalt) {
return ModItems.fragment_cobalt; return ModItems.fragment_cobalt;
} }
if(this == ModBlocks.block_meteor_molten) {
return null;
}
return Item.getItemFromBlock(this); return Item.getItemFromBlock(this);
} }
@ -345,8 +348,7 @@ public class BlockOre extends Block {
public void onBlockDestroyedByPlayer(World world, int x, int y, int z, int i) { public void onBlockDestroyedByPlayer(World world, int x, int y, int z, int i) {
if(this == ModBlocks.block_meteor_molten) { if(this == ModBlocks.block_meteor_molten) {
if(!world.isRemote) if(!world.isRemote) world.setBlock(x, y, z, Blocks.lava);
world.setBlock(x, y, z, Blocks.lava);
} }
} }
} }

View File

@ -314,8 +314,8 @@ public class OreDictManager {
GOLD.plate(plate_gold).dust(powder_gold).ore(ore_gneiss_gold); GOLD.plate(plate_gold).dust(powder_gold).ore(ore_gneiss_gold);
LAPIS.dust(powder_lapis); LAPIS.dust(powder_lapis);
NETHERQUARTZ.gem(Items.quartz).dust(powder_quartz).ore(Blocks.quartz_ore); NETHERQUARTZ.gem(Items.quartz).dust(powder_quartz).ore(Blocks.quartz_ore);
DIAMOND.dust(powder_diamond).ore(gravel_diamond); DIAMOND.dust(powder_diamond).ore(gravel_diamond, ore_sellafield_diamond);
EMERALD.dust(powder_emerald); EMERALD.dust(powder_emerald, ore_sellafield_emerald);
/* /*
* RADIOACTIVE * RADIOACTIVE

View File

@ -2,7 +2,6 @@ package com.hbm.inventory.gui;
import com.hbm.inventory.container.ContainerMachineStrandCaster; import com.hbm.inventory.container.ContainerMachineStrandCaster;
import com.hbm.inventory.material.Mats; import com.hbm.inventory.material.Mats;
import com.hbm.inventory.material.NTMMaterial.SmeltingBehavior;
import com.hbm.lib.RefStrings; import com.hbm.lib.RefStrings;
import com.hbm.tileentity.machine.TileEntityMachineStrandCaster; import com.hbm.tileentity.machine.TileEntityMachineStrandCaster;
import com.hbm.util.I18nUtil; import com.hbm.util.I18nUtil;
@ -39,7 +38,7 @@ public class GUIMachineStrandCaster extends GuiInfoContainer {
drawStackInfo(x, y, 16, 17); drawStackInfo(x, y, 16, 17);
caster.water.renderTankInfo(this, x, y, guiLeft + 82, guiTop + 14, 16, 24); caster.water.renderTankInfo(this, x, y, guiLeft + 82, guiTop + 14, 16, 24);
caster.steam.renderTankInfo(this, x, y, guiLeft + 82, guiTop + 64, 16, 24); caster.steam.renderTankInfo(this, x, y, guiLeft + 82, guiTop + 65, 16, 24);
} }
@Override @Override
@ -78,21 +77,20 @@ public class GUIMachineStrandCaster extends GuiInfoContainer {
GL11.glColor3f(255, 255, 255); GL11.glColor3f(255, 255, 255);
caster.water.renderTank(guiLeft + 82, guiTop + 38, this.zLevel, 16, 24); caster.water.renderTank(guiLeft + 82, guiTop + 38, this.zLevel, 16, 24);
caster.steam.renderTank(guiLeft + 82, guiTop + 90, this.zLevel, 16, 24); caster.steam.renderTank(guiLeft + 82, guiTop + 89, this.zLevel, 16, 24);
} }
protected void drawStackInfo(int mouseX, int mouseY, int x, int y) { protected void drawStackInfo(int mouseX, int mouseY, int x, int y) {
List<String> list = new ArrayList(); List<String> list = new ArrayList();
if (caster.type == null) list.add(EnumChatFormatting.RED + "Empty"); if(caster.type == null)
list.add(EnumChatFormatting.RED + "Empty");
else else
list.add(EnumChatFormatting.YELLOW + I18nUtil.resolveKey(caster.type.getUnlocalizedName()) + ": " + Mats.formatAmount(caster.amount, Keyboard.isKeyDown(Keyboard.KEY_LSHIFT))); list.add(EnumChatFormatting.YELLOW + I18nUtil.resolveKey(caster.type.getUnlocalizedName()) + ": " + Mats.formatAmount(caster.amount, Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)));
this.drawCustomInfoStat(mouseX, mouseY, guiLeft + x, guiTop + y, 36, 81, mouseX, mouseY, list); this.drawCustomInfoStat(mouseX, mouseY, guiLeft + x, guiTop + y, 36, 81, mouseX, mouseY, list);
} }
} }

View File

@ -3,7 +3,7 @@ package com.hbm.lib;
public class RefStrings { public class RefStrings {
public static final String MODID = "hbm"; public static final String MODID = "hbm";
public static final String NAME = "Hbm's Nuclear Tech Mod"; public static final String NAME = "Hbm's Nuclear Tech Mod";
public static final String VERSION = "1.0.27 BETA (4837)"; public static final String VERSION = "1.0.27 BETA (4844)";
//HBM's Beta Naming Convention: //HBM's Beta Naming Convention:
//V T (X) //V T (X)
//V -> next release version //V -> next release version

View File

@ -56,6 +56,7 @@ public class RenderRadarScreen extends TileEntitySpecialRenderer implements IIte
GL11.glDisable(GL11.GL_TEXTURE_2D); GL11.glDisable(GL11.GL_TEXTURE_2D);
GL11.glEnable(GL11.GL_BLEND); GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
GL11.glDisable(GL11.GL_ALPHA_TEST); GL11.glDisable(GL11.GL_ALPHA_TEST);
GL11.glShadeModel(GL11.GL_SMOOTH); GL11.glShadeModel(GL11.GL_SMOOTH);
tess.draw(); tess.draw();

View File

@ -16,7 +16,6 @@ import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.IItemRenderer; import net.minecraftforge.client.IItemRenderer;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import java.awt.*;
import java.nio.DoubleBuffer; import java.nio.DoubleBuffer;
public class RenderStrandCaster extends TileEntitySpecialRenderer implements IItemRendererProvider { public class RenderStrandCaster extends TileEntitySpecialRenderer implements IItemRendererProvider {
@ -70,7 +69,7 @@ public class RenderStrandCaster extends TileEntitySpecialRenderer implements IIt
buf.put(new double[] { 0, 0, -1, 0.5} ); buf.put(new double[] { 0, 0, -1, 0.5} );
buf.rewind(); buf.rewind();
GL11.glClipPlane(GL11.GL_CLIP_PLANE0, buf); GL11.glClipPlane(GL11.GL_CLIP_PLANE0, buf);
GL11.glTranslated(0,0,-offset + 3.4); GL11.glTranslated(0,0,Math.max(-offset + 3.4, 0));
ResourceManager.strand_caster.renderPart("plate"); ResourceManager.strand_caster.renderPart("plate");
GL11.glDisable(GL11.GL_CLIP_PLANE0); GL11.glDisable(GL11.GL_CLIP_PLANE0);
GL11.glPopMatrix(); GL11.glPopMatrix();

View File

@ -45,6 +45,7 @@ public class RenderAccessoryUtility {
private static ResourceLocation vaer = new ResourceLocation(RefStrings.MODID + ":textures/models/capes/CapeVaer.png"); private static ResourceLocation vaer = new ResourceLocation(RefStrings.MODID + ":textures/models/capes/CapeVaer.png");
private static ResourceLocation adam = new ResourceLocation(RefStrings.MODID + ":textures/models/capes/CapeAdam.png"); private static ResourceLocation adam = new ResourceLocation(RefStrings.MODID + ":textures/models/capes/CapeAdam.png");
private static ResourceLocation alcater = new ResourceLocation(RefStrings.MODID + ":textures/models/capes/CapeAlcater.png"); private static ResourceLocation alcater = new ResourceLocation(RefStrings.MODID + ":textures/models/capes/CapeAlcater.png");
private static ResourceLocation jame = new ResourceLocation(RefStrings.MODID + ":textures/models/capes/CapeJame.png");
public static ResourceLocation getCloakFromPlayer(EntityPlayer player) { public static ResourceLocation getCloakFromPlayer(EntityPlayer player) {
@ -127,6 +128,9 @@ public class RenderAccessoryUtility {
if(uuid.equals(Library.Alcater)) { if(uuid.equals(Library.Alcater)) {
return alcater; return alcater;
} }
if(uuid.equals(Library.ege444)) {
return jame;
}
if(Library.contributors.contains(uuid)) { if(Library.contributors.contains(uuid)) {
return wiki; return wiki;
} }

View File

@ -52,7 +52,6 @@ public class TileEntityMachineStrandCaster extends TileEntityFoundryCastingBase
steam = new FluidTank(Fluids.SPENTSTEAM, 64_000); steam = new FluidTank(Fluids.SPENTSTEAM, 64_000);
} }
@Override @Override
public void updateEntity() { public void updateEntity() {
@ -143,7 +142,7 @@ public class TileEntityMachineStrandCaster extends TileEntityFoundryCastingBase
new DirPos(xCoord + rot.offsetX * 2 - dir.offsetX, yCoord, zCoord + rot.offsetZ * 2 - dir.offsetZ, rot), new DirPos(xCoord + rot.offsetX * 2 - dir.offsetX, yCoord, zCoord + rot.offsetZ * 2 - dir.offsetZ, rot),
new DirPos(xCoord - rot.offsetX - dir.offsetX, yCoord, zCoord - rot.offsetZ - dir.offsetZ, rot.getOpposite()), new DirPos(xCoord - rot.offsetX - dir.offsetX, yCoord, zCoord - rot.offsetZ - dir.offsetZ, rot.getOpposite()),
new DirPos(xCoord + rot.offsetX * 2 - dir.offsetX * 5, yCoord, zCoord + rot.offsetZ * 2 - dir.offsetZ * 5, rot), new DirPos(xCoord + rot.offsetX * 2 - dir.offsetX * 5, yCoord, zCoord + rot.offsetZ * 2 - dir.offsetZ * 5, rot),
new DirPos(xCoord - rot.offsetX - dir.offsetX * 5, yCoord, zCoord - rot.offsetZ + dir.offsetZ * 5, rot.getOpposite()), new DirPos(xCoord - rot.offsetX - dir.offsetX * 5, yCoord, zCoord - rot.offsetZ + dir.offsetZ * 5, rot.getOpposite())
}; };
} }
@ -156,13 +155,14 @@ public class TileEntityMachineStrandCaster extends TileEntityFoundryCastingBase
new int[] { xCoord + rot.offsetX - dir.offsetX, yCoord + 2, zCoord + rot.offsetZ - dir.offsetZ }, new int[] { xCoord + rot.offsetX - dir.offsetX, yCoord + 2, zCoord + rot.offsetZ - dir.offsetZ },
new int[] { xCoord - dir.offsetX, yCoord + 2, zCoord - dir.offsetZ }, new int[] { xCoord - dir.offsetX, yCoord + 2, zCoord - dir.offsetZ },
new int[] { xCoord + rot.offsetX, yCoord + 2, zCoord + rot.offsetZ }, new int[] { xCoord + rot.offsetX, yCoord + 2, zCoord + rot.offsetZ },
new int[]{xCoord, yCoord + 2, zCoord}, new int[] { xCoord, yCoord + 2, zCoord }
}; };
} }
@Override @Override
public ItemMold.Mold getInstalledMold() { public ItemMold.Mold getInstalledMold() {
if (slots[0] == null) return null; if(slots[0] == null)
return null;
if(slots[0].getItem() == ModItems.mold) { if(slots[0].getItem() == ModItems.mold) {
return ((ItemMold) slots[0].getItem()).getMold(slots[0]); return ((ItemMold) slots[0].getItem()).getMold(slots[0]);
@ -179,7 +179,8 @@ public class TileEntityMachineStrandCaster extends TileEntityFoundryCastingBase
@Override @Override
public boolean canAcceptPartialPour(World world, int x, int y, int z, double dX, double dY, double dZ, ForgeDirection side, Mats.MaterialStack stack) { public boolean canAcceptPartialPour(World world, int x, int y, int z, double dX, double dY, double dZ, ForgeDirection side, Mats.MaterialStack stack) {
if (side != ForgeDirection.UP) return false; if(side != ForgeDirection.UP)
return false;
for(int[] pos : getMetalPourPos()) { for(int[] pos : getMetalPourPos()) {
if(pos[0] == x && pos[1] == y && pos[2] == z) { if(pos[0] == x && pos[1] == y && pos[2] == z) {
return this.standardCheck(world, x, y, z, side, stack); return this.standardCheck(world, x, y, z, side, stack);
@ -191,7 +192,8 @@ public class TileEntityMachineStrandCaster extends TileEntityFoundryCastingBase
@Override @Override
public boolean standardCheck(World world, int x, int y, int z, ForgeDirection side, Mats.MaterialStack stack) { public boolean standardCheck(World world, int x, int y, int z, ForgeDirection side, Mats.MaterialStack stack) {
if (this.type != null && this.type != stack.material) return false; if(this.type != null && this.type != stack.material)
return false;
return !(this.amount >= this.getCapacity() || getInstalledMold() == null); return !(this.amount >= this.getCapacity() || getInstalledMold() == null);
} }
@ -300,7 +302,6 @@ public class TileEntityMachineStrandCaster extends TileEntityFoundryCastingBase
} }
} }
@Override @Override
public boolean canInsertItem(int slot, ItemStack itemStack, int side) { public boolean canInsertItem(int slot, ItemStack itemStack, int side) {
return this.isItemValidForSlot(slot, itemStack); return this.isItemValidForSlot(slot, itemStack);
@ -323,11 +324,9 @@ public class TileEntityMachineStrandCaster extends TileEntityFoundryCastingBase
zCoord - 7, zCoord - 7,
xCoord + 7, xCoord + 7,
yCoord + 3, yCoord + 3,
zCoord + 7 zCoord + 7);
);
} }
return bb; return bb;
} }
} }

View File

@ -4299,6 +4299,10 @@ tile.ore_random.name=%s-Erz
tile.ore_rare.name=Seltenerden-Erz tile.ore_rare.name=Seltenerden-Erz
tile.ore_reiium.name=Reiit tile.ore_reiium.name=Reiit
tile.ore_schrabidium.name=Schrabidiumerz tile.ore_schrabidium.name=Schrabidiumerz
tile.ore_sellafield_diamond.name=Sellafit-Diamanterz
tile.ore_sellafield_emerald.name=Sellafit-Smaragderz
tile.ore_sellafield_schrabidium.name=Sellafit-Schrabidiumerz
tile.ore_sellafield_uranium_scorched.name=Verschmortes Sellafit-Uranerz
tile.ore_sulfur.name=Schwefelerz tile.ore_sulfur.name=Schwefelerz
tile.ore_tektite_osmiridium.name=Osmiridiumreiches Tektit tile.ore_tektite_osmiridium.name=Osmiridiumreiches Tektit
tile.ore_thorium.name=Thoriumerz tile.ore_thorium.name=Thoriumerz

View File

@ -5291,6 +5291,10 @@ tile.ore_random.name=%s Ore
tile.ore_rare.name=Rare Earth Ore tile.ore_rare.name=Rare Earth Ore
tile.ore_reiium.name=Reiite tile.ore_reiium.name=Reiite
tile.ore_schrabidium.name=Schrabidium Ore tile.ore_schrabidium.name=Schrabidium Ore
tile.ore_sellafield_diamond.name=Sellafite Diamond Ore
tile.ore_sellafield_emerald.name=Sellafite Emerald Ore
tile.ore_sellafield_schrabidium.name=Sellafite Schrabidium Ore
tile.ore_sellafield_uranium_scorched.name=Scorched Sellafite Uranium Ore
tile.ore_sulfur.name=Sulfur Ore tile.ore_sulfur.name=Sulfur Ore
tile.ore_tektite_osmiridium.name=Osmiridium-Infused Tektite tile.ore_tektite_osmiridium.name=Osmiridium-Infused Tektite
tile.ore_thorium.name=Thorium Ore tile.ore_thorium.name=Thorium Ore

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 293 B

After

Width:  |  Height:  |  Size: 300 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 852 B