upstream/TinkersConstruct
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/TinkersConstruct.git synced 2026-10-25 20:32:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into wdmla

Browse Source
This commit is contained in:
Maya authored and GitHub committed 2025-05-30 22:18:29 -06:00
2 parents 2d5cffecde 8695b7f08a
commit a77db17461
31 files changed
+316 -2325
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

dependencies.gradle
+8 -8
View File
@@ -1,14 +1,14 @@
// Add your dependencies here
dependencies {
compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta40:api')
compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta44:api')
api("com.github.GTNewHorizons:Mantle:0.5.0:dev")
api("com.github.GTNewHorizons:ForgeMultipart:1.6.2:dev")
implementation("com.github.GTNewHorizons:NotEnoughItems:2.7.34-GTNH:dev")
api("com.github.GTNewHorizons:ForgeMultipart:1.6.3:dev")
implementation("com.github.GTNewHorizons:NotEnoughItems:2.7.49-GTNH:dev")
compileOnlyApi("curse.maven:cofh-core-69162:2388751")
compileOnly("com.github.GTNewHorizons:inventory-tweaks:1.7.1:api")
compileOnly("com.github.GTNewHorizons:WDMla:2.5.0:dev")
compileOnly("com.github.GTNewHorizons:Battlegear2:1.4.2:api")
compileOnly("com.github.GTNewHorizons:Battlegear2:1.4.3:api")
compileOnly("curse.maven:minefactory-reloaded-66672:2366150")
compileOnly("curse.maven:zelda-sword-skills-220540:2384889")
compileOnly("curse.maven:dynamic-sword-skills-226360:2495462")
@@ -16,13 +16,13 @@ dependencies {
compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev")
compileOnly("com.github.GTNewHorizons:Mobs-Info:0.5.2-GTNH:dev")
compileOnlyApi("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev")
compileOnlyApi("com.github.GTNewHorizons:Natura:2.8.5:dev")
compileOnlyApi("com.github.GTNewHorizons:Natura:2.8.7:dev")
// For testing scythe crop harvesting
// devOnlyNonPublishable("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev")
// devOnlyNonPublishable("com.github.GTNewHorizons:harvestcraft:1.3.1-GTNH:dev")
// devOnlyNonPublishable("com.github.GTNewHorizons:harvestcraft:1.3.2-GTNH:dev")
// devOnlyNonPublishable(deobfCurse("pams-harvest-the-nether-231262:2241397"))
// devOnlyNonPublishable("com.github.GTNewHorizons:Natura:2.8.5:dev")
// devOnlyNonPublishable("com.github.GTNewHorizons:EnderCore:0.4.6")
// devOnlyNonPublishable("com.github.GTNewHorizons:Natura:2.8.7:dev")
// devOnlyNonPublishable("com.github.GTNewHorizons:EnderCore:0.4.8")
}
src/main/java/tconstruct/armor/TinkerArmor.java
+5 -2
View File
@@ -50,6 +50,7 @@ import tconstruct.modifiers.armor.TravelModDoubleJump;
import tconstruct.modifiers.armor.TravelModRepair;
import tconstruct.modifiers.tools.ModAttack;
import tconstruct.tools.TinkerTools;
import tconstruct.util.config.PHConstruct;
import tconstruct.world.TinkerWorld;
@ObjectHolder(TConstruct.modID)
@@ -146,9 +147,11 @@ public class TinkerArmor {
@Handler
public void init(FMLInitializationEvent event) {
craftingTableRecipes();
if (!PHConstruct.disableAllRecipes) {
craftingTableRecipes();
addRecipesForDryingRack();
}
registerModifiers();
addRecipesForDryingRack();
TConstructRegistry.equipableTab.init(travelGoggles.getDefaultItem());
proxy.initialize();
}
src/main/java/tconstruct/client/BlockSkinRenderHelper.java
+1 -1
View File
@@ -981,8 +981,8 @@ public class BlockSkinRenderHelper {
}
// safety
if (flowingIcon == null) flowingIcon = stillIcon != null ? stillIcon : FluidRegistry.WATER.getFlowingIcon();
if (stillIcon == null) stillIcon = FluidRegistry.WATER.getStillIcon();
if (flowingIcon == null) flowingIcon = FluidRegistry.WATER.getFlowingIcon();
boolean raf = renderer.renderAllFaces;
renderer.renderAllFaces = true;
src/main/java/tconstruct/compat/Battlegear2Compat.java
+17
View File
@@ -0,0 +1,17 @@
package tconstruct.compat;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import mods.battlegear2.api.core.IInventoryPlayerBattle;
/**
* This class exists to isolate classes that exist in Battlegear 2 but not in Battlegear 2 for Backhand in order to
* avoid class loading exceptions.
*/
public class Battlegear2Compat {
public static ItemStack getBattlegear2Offhand(EntityPlayer player) {
return ((IInventoryPlayerBattle) player.inventory).battlegear2$getCurrentOffhandWeapon();
}
}
src/main/java/tconstruct/gadgets/TinkerGadgets.java
+2 -1
View File
@@ -22,6 +22,7 @@ import tconstruct.TConstruct;
import tconstruct.gadgets.item.ItemSlimeBoots;
import tconstruct.gadgets.item.ItemSlimeSling;
import tconstruct.library.TConstructRegistry;
import tconstruct.util.config.PHConstruct;
import tconstruct.world.TinkerWorld;
@Pulse(id = "Tinkers' Gadgets", description = "All the fun toys.", forced = true)
@@ -42,7 +43,7 @@ public class TinkerGadgets {
@Handler
public void init(FMLInitializationEvent event) {
if (!Loader.isModLoaded("dreamcraft")) {
if (!(Loader.isModLoaded("dreamcraft") || PHConstruct.disableAllRecipes)) {
ItemStack slimeBlockGreen = new ItemStack(TinkerWorld.slimeGel, 1, 1);
GameRegistry.addShapedRecipe(
src/main/java/tconstruct/library/crafting/ToolBuilder.java
+1 -6
View File
@@ -268,12 +268,7 @@ public class ToolBuilder {
if (name != null && !name.equals("")) {
compound.setTag("display", new NBTTagCompound());
compound.getCompoundTag("display").setString("Name", "\u00A7f" + name);
}
// set a nice default name
else {
compound.setTag("display", new NBTTagCompound());
compound.getCompoundTag("display").setString("Name", "\u00A7f" + defaultToolName(headMat, item));
compound.getCompoundTag("display").setString("Name", name);
}
ToolCraftEvent.NormalTool event = new ToolCraftEvent.NormalTool(
src/main/java/tconstruct/library/tools/ToolCore.java
+7 -1
View File
@@ -439,7 +439,7 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IEq
for (Map.Entry<Integer, tconstruct.library.tools.ToolMaterial> integerToolMaterialEntry : TConstructRegistry.toolMaterials
.entrySet()) {
tconstruct.library.tools.ToolMaterial material = integerToolMaterialEntry.getValue();
buildTool(integerToolMaterialEntry.getKey(), ToolBuilder.defaultToolName(material, this), list);
buildTool(integerToolMaterialEntry.getKey(), null, list);
}
}
@@ -822,4 +822,10 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IEq
return curTags.equals(prevTags);
}
// end of TE support section
@Override
public String getItemStackDisplayName(ItemStack stack) {
String name = ToolBuilder.defaultToolName(stack);
return name != null ? name : super.getItemStackDisplayName(stack);
}
}
src/main/java/tconstruct/library/weaponry/BowBaseAmmo.java
+5 -3
View File
@@ -13,7 +13,8 @@ import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import cpw.mods.fml.common.Loader;
import mods.battlegear2.api.core.IInventoryPlayerBattle;
import mods.battlegear2.api.core.IBattlePlayer;
import tconstruct.compat.Battlegear2Compat;
import tconstruct.library.TConstructRegistry;
import tconstruct.library.crafting.ToolBuilder;
import tconstruct.library.tools.BowstringMaterial;
@@ -62,8 +63,9 @@ public abstract class BowBaseAmmo extends ProjectileWeapon {
@Override
public ItemStack searchForAmmo(EntityPlayer player, ItemStack weapon) {
// arrow priority: hotbar > inventory, tinker arrows > regular arrows
if (isBattlegear2Loaded) {
ItemStack offhand = ((IInventoryPlayerBattle) player.inventory).battlegear2$getCurrentOffhandWeapon();
if (isBattlegear2Loaded && player instanceof IBattlePlayer battlePlayer
&& battlePlayer.battlegear2$isBattlemode()) {
ItemStack offhand = Battlegear2Compat.getBattlegear2Offhand(player);
if (checkTinkerArrow(offhand) || checkVanillaArrow(offhand)) {
return offhand;
}
src/main/java/tconstruct/mechworks/TinkerMechworks.java
+55 -52
View File
@@ -23,6 +23,7 @@ import tconstruct.mechworks.entity.item.ExplosivePrimed;
import tconstruct.mechworks.itemblocks.ItemBlockLandmine;
import tconstruct.mechworks.logic.TileEntityLandmine;
import tconstruct.tools.TinkerTools;
import tconstruct.util.config.PHConstruct;
@ObjectHolder(TConstruct.modID)
// TODO handle migration of all items/blocks that were owned by the previously seperate mod
@@ -46,58 +47,60 @@ public class TinkerMechworks {
GameRegistry.registerTileEntity(TileEntityLandmine.class, "Landmine");
// Landmine Recipes
GameRegistry.addRecipe(
new ShapedOreRecipe(
new ItemStack(TinkerMechworks.landmine, 1, 0),
"mcm",
"rpr",
'm',
"plankWood",
'c',
new ItemStack(TinkerTools.blankPattern, 1, 1),
'r',
"dustRedstone",
'p',
Blocks.stone_pressure_plate));
GameRegistry.addRecipe(
new ShapedOreRecipe(
new ItemStack(TinkerMechworks.landmine, 1, 1),
"mcm",
"rpr",
'm',
Blocks.stone,
'c',
new ItemStack(TinkerTools.blankPattern, 1, 1),
'r',
"dustRedstone",
'p',
Blocks.stone_pressure_plate));
GameRegistry.addRecipe(
new ShapedOreRecipe(
new ItemStack(TinkerMechworks.landmine, 1, 2),
"mcm",
"rpr",
'm',
Blocks.obsidian,
'c',
new ItemStack(TinkerTools.blankPattern, 1, 1),
'r',
"dustRedstone",
'p',
Blocks.stone_pressure_plate));
GameRegistry.addRecipe(
new ShapedOreRecipe(
new ItemStack(TinkerMechworks.landmine, 1, 3),
"mcm",
"rpr",
'm',
Items.repeater,
'c',
new ItemStack(TinkerTools.blankPattern, 1, 1),
'r',
"dustRedstone",
'p',
Blocks.stone_pressure_plate));
if (!PHConstruct.disableAllRecipes) {
GameRegistry.addRecipe(
new ShapedOreRecipe(
new ItemStack(TinkerMechworks.landmine, 1, 0),
"mcm",
"rpr",
'm',
"plankWood",
'c',
new ItemStack(TinkerTools.blankPattern, 1, 1),
'r',
"dustRedstone",
'p',
Blocks.stone_pressure_plate));
GameRegistry.addRecipe(
new ShapedOreRecipe(
new ItemStack(TinkerMechworks.landmine, 1, 1),
"mcm",
"rpr",
'm',
Blocks.stone,
'c',
new ItemStack(TinkerTools.blankPattern, 1, 1),
'r',
"dustRedstone",
'p',
Blocks.stone_pressure_plate));
GameRegistry.addRecipe(
new ShapedOreRecipe(
new ItemStack(TinkerMechworks.landmine, 1, 2),
"mcm",
"rpr",
'm',
Blocks.obsidian,
'c',
new ItemStack(TinkerTools.blankPattern, 1, 1),
'r',
"dustRedstone",
'p',
Blocks.stone_pressure_plate));
GameRegistry.addRecipe(
new ShapedOreRecipe(
new ItemStack(TinkerMechworks.landmine, 1, 3),
"mcm",
"rpr",
'm',
Items.repeater,
'c',
new ItemStack(TinkerTools.blankPattern, 1, 1),
'r',
"dustRedstone",
'p',
Blocks.stone_pressure_plate));
}
EntityRegistry.registerModEntity(
EntityLandmineFirework.class,
src/main/java/tconstruct/mechworks/model/CartRender.java
-132
View File
@@ -1,132 +0,0 @@
package tconstruct.mechworks.model;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.entity.Render;
import net.minecraft.entity.Entity;
import net.minecraft.init.Blocks;
import net.minecraft.util.MathHelper;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.Vec3;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import tconstruct.world.entity.CartEntity;
@SideOnly(Side.CLIENT)
public class CartRender extends Render {
protected ModelBase modelCart;
RenderBlocks renderblocks;
public CartRender() {
this.shadowSize = 0.5F;
this.modelCart = new ModelPullcart();
renderblocks = new RenderBlocks();
}
public void renderPullcart(CartEntity cart, double posX, double posY, double posZ, float par8, float par9) {
GL11.glPushMatrix();
long var10 = (long) cart.hashCode() * 493286711L;
var10 = var10 * var10 * 4392167121L + var10 * 98761L;
float var12 = (((float) (var10 >> 16 & 7L) + 0.5F) / 8.0F - 0.5F) * 0.004F;
float var13 = (((float) (var10 >> 20 & 7L) + 0.5F) / 8.0F - 0.5F) * 0.004F;
float var14 = (((float) (var10 >> 24 & 7L) + 0.5F) / 8.0F - 0.5F) * 0.004F;
GL11.glTranslatef(var12, var13, var14);
double var15 = cart.lastTickPosX + (cart.posX - cart.lastTickPosX) * (double) par9;
double var17 = cart.lastTickPosY + (cart.posY - cart.lastTickPosY) * (double) par9;
double var19 = cart.lastTickPosZ + (cart.posZ - cart.lastTickPosZ) * (double) par9;
double var21 = 0.30000001192092896D;
Vec3 var23 = cart.func_70489_a(var15, var17, var19);
float var24 = cart.prevRotationPitch + (cart.rotationPitch - cart.prevRotationPitch) * par9;
if (var23 != null) {
Vec3 var25 = cart.func_70495_a(var15, var17, var19, var21);
Vec3 var26 = cart.func_70495_a(var15, var17, var19, -var21);
if (var25 == null) {
var25 = var23;
}
if (var26 == null) {
var26 = var23;
}
posX += var23.xCoord - var15;
posY += (var25.yCoord + var26.yCoord) / 2.0D - var17;
posZ += var23.zCoord - var19;
Vec3 var27 = var26.addVector(-var25.xCoord, -var25.yCoord, -var25.zCoord);
if (var27.lengthVector() != 0.0D) {
var27 = var27.normalize();
par8 = (float) (Math.atan2(var27.zCoord, var27.xCoord) * 180.0D / Math.PI);
var24 = (float) (Math.atan(var27.yCoord) * 73.0D);
}
}
GL11.glTranslatef((float) posX, (float) posY + 0.3125f, (float) posZ);
GL11.glRotatef(180.0F - par8, 0.0F, 1.0F, 0.0F);
GL11.glRotatef(-var24, 0.0F, 0.0F, 1.0F);
float var28 = (float) cart.getRollingAmplitude() - par9;
float var30 = (float) cart.getDamage() - par9;
if (var30 < 0.0F) {
var30 = 0.0F;
}
if (var28 > 0.0F) {
GL11.glRotatef(
MathHelper.sin(var28) * var28 * var30 / 10.0F * (float) cart.getRollingDirection(),
1.0F,
0.0F,
0.0F);
}
if (cart.getCartType() != 0) {
// this.loadTexture("/terrain.png");
float var29 = 0.75F;
GL11.glScalef(var29, var29, var29);
if (cart.getCartType() == 1) {
GL11.glTranslatef(0.0F, 0.5F, 0.0F);
renderblocks.renderBlockAsItem(Blocks.chest, 0, cart.getBrightness(par9));
GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F);
GL11.glTranslatef(0.5F, 0.0F, -0.5F);
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
} else if (cart.getCartType() == 2) {
GL11.glTranslatef(0.0F, 0.3125F, 0.0F);
renderblocks.renderBlockAsItem(Blocks.furnace, 0, cart.getBrightness(par9));
GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F);
GL11.glTranslatef(0.0F, -0.3125F, 0.0F);
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
}
// GL11.glScalef(1.0F / var29, 1.0F / var29, 1.0F / var29);
}
// this.loadTexture("/tinkertextures/entity/pullcart.png");
GL11.glScalef(-1.0F, -1.0F, 1.0F);
this.modelCart.render(cart, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F);
GL11.glPopMatrix();
}
/**
* Actually renders the given argument. This is a synthetic bridge method, always casting down its argument and then
* handing it off to a worker function which does the actual work. In all probabilty, the class Render is generic
* (Render<T extends Entity) and this method has signature public void doRender(T entity, double d, double d1,
* double d2, float f, float f1). But JAD is pre 1.5 so doesn't do that.
*/
@Override
public void doRender(Entity par1Entity, double par2, double par4, double par6, float par8, float par9) {
this.renderPullcart((CartEntity) par1Entity, par2, par4, par6, par8, par9);
}
@Override
protected ResourceLocation getEntityTexture(Entity par1Entity) {
return texture;
}
static final ResourceLocation texture = new ResourceLocation("assets/tinker/textures/mob/pullcart.png");
}
src/main/java/tconstruct/mechworks/model/ModelPullcart.java
-278
View File
@@ -1,278 +0,0 @@
package tconstruct.mechworks.model;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
public class ModelPullcart extends ModelBase {
ModelRenderer BackPanel;
ModelRenderer FrontPanel;
ModelRenderer RightPanel;
ModelRenderer LeftPanel;
ModelRenderer BottomPanel;
ModelRenderer RightHandle;
ModelRenderer LeftHandle;
ModelRenderer RightSpokeUp;
ModelRenderer RightSpokeRight;
ModelRenderer RightSpokeDown;
ModelRenderer RightSpokeLeft;
ModelRenderer RightAxle;
ModelRenderer WheelRight1;
ModelRenderer WheelRight2;
ModelRenderer WheelRight3;
ModelRenderer WheelRight4;
ModelRenderer WheelRight5;
ModelRenderer WheelRight6;
ModelRenderer WheelRight7;
ModelRenderer WheelRight8;
ModelRenderer WheelRight9;
ModelRenderer WheelRight10;
ModelRenderer WheelRight11;
ModelRenderer WheelRight12;
ModelRenderer LeftSpokeRight;
ModelRenderer LeftSpokeLeft;
ModelRenderer LeftSpokeDown;
ModelRenderer LeftSpokeUp;
ModelRenderer LeftAxle;
ModelRenderer WheelLeft1;
ModelRenderer WheelLeft2;
ModelRenderer WheelLeft3;
ModelRenderer WheelLeft4;
ModelRenderer WheelLeft5;
ModelRenderer WheelLeft6;
ModelRenderer WheelLeft7;
ModelRenderer WheelLeft8;
ModelRenderer WheelLeft9;
ModelRenderer WheelLeft10;
ModelRenderer WheelLeft11;
ModelRenderer WheelLeft12;
public ModelPullcart() {
textureWidth = 128;
textureHeight = 64;
BackPanel = new ModelRenderer(this, 0, 12);
BackPanel.addBox(-10F, 0F, 0F, 20, 10, 2);
BackPanel.setRotationPoint(0F, -8F, 8F);
setRotation(BackPanel, 0F, 0F, 0F);
FrontPanel = new ModelRenderer(this, 0, 0);
FrontPanel.addBox(-10F, 0F, 0F, 20, 10, 2);
FrontPanel.setRotationPoint(0F, -8F, -10F);
setRotation(FrontPanel, 0F, 0F, 0F);
RightPanel = new ModelRenderer(this, 0, 35);
RightPanel.addBox(0F, 0F, -10F, 2, 8, 20);
RightPanel.setRotationPoint(-12F, -6F, 0F);
setRotation(RightPanel, 0F, 0F, 0F);
LeftPanel = new ModelRenderer(this, 24, 15);
LeftPanel.addBox(0F, 0F, -10F, 2, 8, 20);
LeftPanel.setRotationPoint(10F, -6F, 0F);
setRotation(LeftPanel, 0F, 0F, 0F);
BottomPanel = new ModelRenderer(this, 40, 43);
BottomPanel.addBox(-12F, 0F, -10F, 24, 1, 20);
BottomPanel.setRotationPoint(0F, 2F, 0F);
setRotation(BottomPanel, 0F, 0F, 0F);
RightHandle = new ModelRenderer(this, 92, 33);
RightHandle.addBox(0F, 0F, 0F, 16, 2, 2);
RightHandle.setRotationPoint(-28F, 0F, -7F);
setRotation(RightHandle, 0F, 0F, 0F);
LeftHandle = new ModelRenderer(this, 92, 38);
LeftHandle.addBox(0F, 0F, 0F, 16, 2, 2);
LeftHandle.setRotationPoint(-28F, 0F, 5F);
setRotation(LeftHandle, 0F, 0F, 0F);
RightSpokeUp = new ModelRenderer(this, 99, 3);
RightSpokeUp.addBox(-2F, -8F, 0F, 4, 6, 1);
RightSpokeUp.setRotationPoint(0F, 3F, -11F);
setRotation(RightSpokeUp, 0F, 0F, 0F);
RightSpokeRight = new ModelRenderer(this, 112, 15);
RightSpokeRight.addBox(2F, -2F, 0F, 6, 4, 1);
RightSpokeRight.setRotationPoint(0F, 3F, -11F);
setRotation(RightSpokeRight, 0F, 0F, 0F);
RightSpokeDown = new ModelRenderer(this, 99, 25);
RightSpokeDown.addBox(-2F, 2F, 0F, 4, 6, 1);
RightSpokeDown.setRotationPoint(0F, 3F, -11F);
setRotation(RightSpokeDown, 0F, 0F, 0F);
RightSpokeLeft = new ModelRenderer(this, 82, 15);
RightSpokeLeft.addBox(-8F, -2F, 0F, 6, 4, 1);
RightSpokeLeft.setRotationPoint(0F, 3F, -11F);
setRotation(RightSpokeLeft, 0F, 0F, 0F);
RightAxle = new ModelRenderer(this, 98, 14);
RightAxle.addBox(-2F, -2F, 0F, 4, 4, 2);
RightAxle.setRotationPoint(0F, 3F, -12F);
setRotation(RightAxle, 0F, 0F, 0F);
WheelRight1 = new ModelRenderer(this, 110, 3);
WheelRight1.addBox(2F, -7F, 0F, 2, 2, 1);
WheelRight1.setRotationPoint(0F, 3F, -11F);
setRotation(WheelRight1, 0F, 0F, 0F);
WheelRight2 = new ModelRenderer(this, 117, 5);
WheelRight2.addBox(4F, -6F, 0F, 2, 2, 1);
WheelRight2.setRotationPoint(0F, 3F, -11F);
setRotation(WheelRight2, 0F, 0F, 0F);
WheelRight3 = new ModelRenderer(this, 122, 9);
WheelRight3.addBox(5F, -4F, 0F, 2, 2, 1);
WheelRight3.setRotationPoint(0F, 3F, -11F);
setRotation(WheelRight3, 0F, 0F, 0F);
WheelRight4 = new ModelRenderer(this, 122, 23);
WheelRight4.addBox(5F, 2F, 0F, 2, 2, 1);
WheelRight4.setRotationPoint(0F, 3F, -11F);
setRotation(WheelRight4, 0F, 0F, 0F);
WheelRight5 = new ModelRenderer(this, 117, 27);
WheelRight5.addBox(4F, 4F, 0F, 2, 2, 1);
WheelRight5.setRotationPoint(0F, 3F, -11F);
setRotation(WheelRight5, 0F, 0F, 0F);
WheelRight6 = new ModelRenderer(this, 110, 29);
WheelRight6.addBox(2F, 5F, 0F, 2, 2, 1);
WheelRight6.setRotationPoint(0F, 3F, -11F);
setRotation(WheelRight6, 0F, 0F, 0F);
WheelRight7 = new ModelRenderer(this, 92, 29);
WheelRight7.addBox(-4F, 5F, 0F, 2, 2, 1);
WheelRight7.setRotationPoint(0F, 3F, -11F);
setRotation(WheelRight7, 0F, 0F, 0F);
WheelRight8 = new ModelRenderer(this, 85, 27);
WheelRight8.addBox(-6F, 4F, 0F, 2, 2, 1);
WheelRight8.setRotationPoint(0F, 3F, -11F);
setRotation(WheelRight8, 0F, 0F, 0F);
WheelRight9 = new ModelRenderer(this, 80, 23);
WheelRight9.addBox(-7F, 2F, 0F, 2, 2, 1);
WheelRight9.setRotationPoint(0F, 3F, -11F);
setRotation(WheelRight9, 0F, 0F, 0F);
WheelRight10 = new ModelRenderer(this, 80, 9);
WheelRight10.addBox(-7F, -4F, 0F, 2, 2, 1);
WheelRight10.setRotationPoint(0F, 3F, -11F);
setRotation(WheelRight10, 0F, 0F, 0F);
WheelRight11 = new ModelRenderer(this, 85, 5);
WheelRight11.addBox(-6F, -6F, 0F, 2, 2, 1);
WheelRight11.setRotationPoint(0F, 3F, -11F);
setRotation(WheelRight11, 0F, 0F, 0F);
WheelRight12 = new ModelRenderer(this, 92, 3);
WheelRight12.addBox(-4F, -7F, 0F, 2, 2, 1);
WheelRight12.setRotationPoint(0F, 3F, -11F);
setRotation(WheelRight12, 0F, 0F, 0F);
LeftSpokeRight = new ModelRenderer(this, 82, 15);
LeftSpokeRight.addBox(-8F, -2F, 0F, 6, 4, 1);
LeftSpokeRight.setRotationPoint(0F, 3F, 10F);
setRotation(LeftSpokeRight, 0F, 0F, 0F);
LeftSpokeLeft = new ModelRenderer(this, 112, 15);
LeftSpokeLeft.addBox(2F, -2F, 0F, 6, 4, 1);
LeftSpokeLeft.setRotationPoint(0F, 3F, 10F);
setRotation(LeftSpokeLeft, 0F, 0F, 0F);
LeftSpokeDown = new ModelRenderer(this, 99, 25);
LeftSpokeDown.addBox(-2F, 2F, 0F, 4, 6, 1);
LeftSpokeDown.setRotationPoint(0F, 3F, 10F);
setRotation(LeftSpokeDown, 0F, 0F, 0F);
LeftSpokeUp = new ModelRenderer(this, 99, 3);
LeftSpokeUp.addBox(-2F, -8F, 0F, 4, 6, 1);
LeftSpokeUp.setRotationPoint(0F, 3F, 10F);
setRotation(LeftSpokeUp, 0F, 0F, 0F);
LeftAxle = new ModelRenderer(this, 98, 14);
LeftAxle.addBox(-2F, -2F, 0F, 4, 4, 2);
LeftAxle.setRotationPoint(0F, 3F, 10F);
setRotation(LeftAxle, 0F, 0F, 0F);
WheelLeft1 = new ModelRenderer(this, 92, 3);
WheelLeft1.addBox(-4F, -7F, 0F, 2, 2, 1);
WheelLeft1.setRotationPoint(0F, 3F, 10F);
setRotation(WheelLeft1, 0F, 0F, 0F);
WheelLeft2 = new ModelRenderer(this, 117, 5);
WheelLeft2.addBox(-6F, -6F, 0F, 2, 2, 1);
WheelLeft2.setRotationPoint(0F, 3F, 10F);
setRotation(WheelLeft2, 0F, 0F, 0F);
WheelLeft3 = new ModelRenderer(this, 80, 9);
WheelLeft3.addBox(-7F, -4F, 0F, 2, 2, 1);
WheelLeft3.setRotationPoint(0F, 3F, 10F);
setRotation(WheelLeft3, 0F, 0F, 0F);
WheelLeft4 = new ModelRenderer(this, 80, 23);
WheelLeft4.addBox(-7F, 2F, 0F, 2, 2, 1);
WheelLeft4.setRotationPoint(0F, 3F, 10F);
setRotation(WheelLeft4, 0F, 0F, 0F);
WheelLeft5 = new ModelRenderer(this, 117, 27);
WheelLeft5.addBox(-6F, 4F, 0F, 2, 2, 1);
WheelLeft5.setRotationPoint(0F, 3F, 10F);
setRotation(WheelLeft5, 0F, 0F, 0F);
WheelLeft6 = new ModelRenderer(this, 110, 29);
WheelLeft6.addBox(-4F, 5F, 0F, 2, 2, 1);
WheelLeft6.setRotationPoint(0F, 3F, 10F);
setRotation(WheelLeft6, 0F, 0F, 0F);
WheelLeft7 = new ModelRenderer(this, 92, 29);
WheelLeft7.addBox(2F, 5F, 0F, 2, 2, 1);
WheelLeft7.setRotationPoint(0F, 3F, 10F);
setRotation(WheelLeft7, 0F, 0F, 0F);
WheelLeft8 = new ModelRenderer(this, 85, 27);
WheelLeft8.addBox(4F, 4F, 0F, 2, 2, 1);
WheelLeft8.setRotationPoint(0F, 3F, 10F);
setRotation(WheelLeft8, 0F, 0F, 0F);
WheelLeft9 = new ModelRenderer(this, 122, 23);
WheelLeft9.addBox(5F, 2F, 0F, 2, 2, 1);
WheelLeft9.setRotationPoint(0F, 3F, 10F);
setRotation(WheelLeft9, 0F, 0F, 0F);
WheelLeft10 = new ModelRenderer(this, 122, 9);
WheelLeft10.addBox(5F, -4F, 0F, 2, 2, 1);
WheelLeft10.setRotationPoint(0F, 3F, 10F);
setRotation(WheelLeft10, 0F, 0F, 0F);
WheelLeft11 = new ModelRenderer(this, 85, 5);
WheelLeft11.addBox(4F, -6F, 0F, 2, 2, 1);
WheelLeft11.setRotationPoint(0F, 3F, 10F);
setRotation(WheelLeft11, 0F, 0F, 0F);
WheelLeft12 = new ModelRenderer(this, 110, 3);
WheelLeft12.addBox(2F, -7F, 0F, 2, 2, 1);
WheelLeft12.setRotationPoint(0F, 3F, 10F);
setRotation(WheelLeft12, 0F, 0F, 0F);
}
@Override
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
super.render(entity, f, f1, f2, f3, f4, f5);
setRotationAngles(f, f1, f2, f3, f4, f5, entity);
BackPanel.render(f5);
FrontPanel.render(f5);
RightPanel.render(f5);
LeftPanel.render(f5);
BottomPanel.render(f5);
RightHandle.render(f5);
LeftHandle.render(f5);
RightSpokeUp.render(f5);
RightSpokeRight.render(f5);
RightSpokeDown.render(f5);
RightSpokeLeft.render(f5);
RightAxle.render(f5);
WheelRight1.render(f5);
WheelRight2.render(f5);
WheelRight3.render(f5);
WheelRight4.render(f5);
WheelRight5.render(f5);
WheelRight6.render(f5);
WheelRight7.render(f5);
WheelRight8.render(f5);
WheelRight9.render(f5);
WheelRight10.render(f5);
WheelRight11.render(f5);
WheelRight12.render(f5);
LeftSpokeRight.render(f5);
LeftSpokeLeft.render(f5);
LeftSpokeDown.render(f5);
LeftSpokeUp.render(f5);
LeftAxle.render(f5);
WheelLeft1.render(f5);
WheelLeft2.render(f5);
WheelLeft3.render(f5);
WheelLeft4.render(f5);
WheelLeft5.render(f5);
WheelLeft6.render(f5);
WheelLeft7.render(f5);
WheelLeft8.render(f5);
WheelLeft9.render(f5);
WheelLeft10.render(f5);
WheelLeft11.render(f5);
WheelLeft12.render(f5);
}
private void setRotation(ModelRenderer model, float x, float y, float z) {
model.rotateAngleX = x;
model.rotateAngleY = y;
model.rotateAngleZ = z;
}
@Override
public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) {
super.setRotationAngles(f, f1, f2, f3, f4, f5, entity);
}
}
src/main/java/tconstruct/mechworks/model/ModelWagon.java
-455
View File
@@ -1,455 +0,0 @@
package tconstruct.mechworks.model;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
public class ModelWagon extends ModelBase {
ModelRenderer Bottom;
ModelRenderer Left;
ModelRenderer Right;
ModelRenderer Back;
ModelRenderer Front;
ModelRenderer Leftpull;
ModelRenderer Rightpull;
ModelRenderer LeftWheelAxle;
ModelRenderer LeftWCenterHbeam;
ModelRenderer LeftWCenterVtop;
ModelRenderer LeftWCenterVbottom;
ModelRenderer LeftWnwH;
ModelRenderer LeftWnwM;
ModelRenderer LeftWnwV;
ModelRenderer LeftWnwEye;
ModelRenderer LeftWneH;
ModelRenderer LeftWneM;
ModelRenderer LeftWneV;
ModelRenderer LeftWneEye;
ModelRenderer LeftWswH;
ModelRenderer LeftWswM;
ModelRenderer LeftWswV;
ModelRenderer LeftWswEye;
ModelRenderer LeftWseH;
ModelRenderer LeftWseM;
ModelRenderer LeftWseV;
ModelRenderer LeftWseEye;
ModelRenderer RightWheelAxle;
ModelRenderer RightWCenterHbeam;
ModelRenderer RightWCenterVtop;
ModelRenderer RightWCenterVbottom;
ModelRenderer RightWnwH;
ModelRenderer RightWnwM;
ModelRenderer RightWnwV;
ModelRenderer RightWnwEye;
ModelRenderer RoghtWneH;
ModelRenderer RightWneM;
ModelRenderer RightWneV;
ModelRenderer RightWneEye;
ModelRenderer RightWswH;
ModelRenderer RightWswM;
ModelRenderer RightWswV;
ModelRenderer RightWswEye;
ModelRenderer RightWseH;
ModelRenderer RightWseM;
ModelRenderer RightWseV;
public ModelRenderer RightWseEye;
ModelRenderer HandBrakeMain;
ModelRenderer HandbrakeJamb;
ModelRenderer StandCenterBar;
ModelRenderer StandLeft;
ModelRenderer StandRight;
public ModelWagon() {
this.textureWidth = 128;
this.textureHeight = 64;
this.Bottom = new ModelRenderer(this, 26, 46);
this.Bottom.addBox(0.0F, 0.0F, 0.0F, 20, 2, 16);
this.Bottom.setRotationPoint(-10.0F, 4.0F, -8.0F);
this.Bottom.setTextureSize(64, 32);
this.Bottom.mirror = true;
this.setRotation(this.Bottom, 0.0F, 0.0F, 0.0F);
this.Left = new ModelRenderer(this, 0, 35);
this.Left.addBox(0.0F, 0.0F, 0.0F, 20, 8, 2);
this.Left.setRotationPoint(-10.0F, -4.0F, -8.0F);
this.Left.setTextureSize(64, 32);
this.Left.mirror = true;
this.setRotation(this.Left, 0.0F, 0.0F, 0.0F);
this.Right = new ModelRenderer(this, 83, 35);
this.Right.addBox(0.0F, 0.0F, 0.0F, 20, 8, 2);
this.Right.setRotationPoint(-10.0F, -4.0F, 6.0F);
this.Right.setTextureSize(64, 32);
this.Right.mirror = true;
this.setRotation(this.Right, 0.0F, 0.0F, 0.0F);
this.Back = new ModelRenderer(this, 99, 46);
this.Back.addBox(-2.0F, -5.0F, 0.0F, 2, 5, 12);
this.Back.setRotationPoint(10.0F, 4.0F, -6.0F);
this.Back.setTextureSize(64, 32);
this.Back.mirror = true;
this.setRotation(this.Back, 0.0F, 0.0F, 0.0F);
this.Front = new ModelRenderer(this, 50, 1);
this.Front.addBox(0.0F, 0.0F, 0.0F, 2, 8, 12);
this.Front.setRotationPoint(-10.0F, -4.0F, -6.0F);
this.Front.setTextureSize(64, 32);
this.Front.mirror = true;
this.setRotation(this.Front, 0.0F, 0.0F, 0.0F);
this.Leftpull = new ModelRenderer(this, 0, 30);
this.Leftpull.addBox(0.0F, 0.0F, 0.0F, 16, 2, 2);
this.Leftpull.setRotationPoint(-26.0F, 2.0F, -6.0F);
this.Leftpull.setTextureSize(64, 32);
this.Leftpull.mirror = true;
this.setRotation(this.Leftpull, 0.0F, 0.0F, 0.0F);
this.Rightpull = new ModelRenderer(this, 91, 30);
this.Rightpull.addBox(0.0F, 0.0F, 0.0F, 16, 2, 2);
this.Rightpull.setRotationPoint(-26.0F, 2.0F, 4.0F);
this.Rightpull.setTextureSize(64, 32);
this.Rightpull.mirror = true;
this.setRotation(this.Rightpull, 0.0F, 0.0F, 0.0F);
this.HandBrakeMain = new ModelRenderer(this, 1, 59);
this.HandBrakeMain.addBox(-6.0F, 0.0F, 0.0F, 11, 1, 1);
this.HandBrakeMain.setRotationPoint(-9.0F, -3.0F, -9.0F);
this.HandBrakeMain.setTextureSize(64, 32);
this.HandBrakeMain.mirror = true;
this.setRotation(this.HandBrakeMain, 0.0F, 0.0F, 0.0F);
this.HandbrakeJamb = new ModelRenderer(this, 10, 62);
this.HandbrakeJamb.addBox(3.0F, 1.0F, 0.0F, 2, 1, 1);
this.HandbrakeJamb.setRotationPoint(-9.0F, -3.0F, -9.0F);
this.HandbrakeJamb.setTextureSize(64, 32);
this.HandbrakeJamb.mirror = true;
this.setRotation(this.HandbrakeJamb, 0.0F, 0.0F, 0.0F);
this.LeftWheelAxle = new ModelRenderer(this, 0, 12);
this.LeftWheelAxle.addBox(-1.0F, -1.0F, -1.0F, 2, 2, 3);
this.LeftWheelAxle.setRotationPoint(0.0F, 5.0F, -10.0F);
this.LeftWheelAxle.setTextureSize(64, 32);
this.LeftWheelAxle.mirror = true;
this.setRotation(this.LeftWheelAxle, 0.0F, 0.0F, 0.0F);
this.LeftWCenterHbeam = new ModelRenderer(this, 12, 12);
this.LeftWCenterHbeam.addBox(-8.0F, -2.0F, 0.0F, 16, 4, 1);
this.LeftWCenterHbeam.setRotationPoint(0.0F, 5.0F, -10.0F);
this.LeftWCenterHbeam.setTextureSize(64, 32);
this.LeftWCenterHbeam.mirror = true;
this.setRotation(this.LeftWCenterHbeam, 0.0F, 0.0F, 0.0F);
this.LeftWCenterVtop = new ModelRenderer(this, 18, 0);
this.LeftWCenterVtop.addBox(-2.0F, -8.0F, 0.0F, 4, 6, 1);
this.LeftWCenterVtop.setRotationPoint(0.0F, 5.0F, -10.0F);
this.LeftWCenterVtop.setTextureSize(64, 32);
this.LeftWCenterVtop.mirror = true;
this.setRotation(this.LeftWCenterVtop, 0.0F, 0.0F, 0.0F);
this.LeftWCenterVbottom = new ModelRenderer(this, 18, 22);
this.LeftWCenterVbottom.addBox(-2.0F, 2.0F, 0.0F, 4, 6, 1);
this.LeftWCenterVbottom.setRotationPoint(0.0F, 5.0F, -10.0F);
this.LeftWCenterVbottom.setTextureSize(64, 32);
this.LeftWCenterVbottom.mirror = true;
this.setRotation(this.LeftWCenterVbottom, 0.0F, 0.0F, 0.0F);
this.LeftWnwH = new ModelRenderer(this, 0, 7);
this.LeftWnwH.addBox(-7.0F, -4.0F, 0.0F, 3, 2, 1);
this.LeftWnwH.setRotationPoint(0.0F, 5.0F, -10.0F);
this.LeftWnwH.setTextureSize(64, 32);
this.LeftWnwH.mirror = true;
this.setRotation(this.LeftWnwH, 0.0F, 0.0F, 0.0F);
this.LeftWnwM = new ModelRenderer(this, 4, 3);
this.LeftWnwM.addBox(-6.0F, -6.0F, 0.0F, 2, 2, 1);
this.LeftWnwM.setRotationPoint(0.0F, 5.0F, -10.0F);
this.LeftWnwM.setTextureSize(64, 32);
this.LeftWnwM.mirror = true;
this.setRotation(this.LeftWnwM, 0.0F, 0.0F, 0.0F);
this.LeftWnwV = new ModelRenderer(this, 11, 1);
this.LeftWnwV.addBox(-4.0F, -7.0F, 0.0F, 2, 3, 1);
this.LeftWnwV.setRotationPoint(0.0F, 5.0F, -10.0F);
this.LeftWnwV.setTextureSize(64, 32);
this.LeftWnwV.mirror = true;
this.setRotation(this.LeftWnwV, 0.0F, 0.0F, 0.0F);
this.LeftWnwEye = new ModelRenderer(this, 10, 7);
this.LeftWnwEye.addBox(-4.0F, -4.0F, 0.0F, 1, 1, 1);
this.LeftWnwEye.setRotationPoint(0.0F, 5.0F, -10.0F);
this.LeftWnwEye.setTextureSize(64, 32);
this.LeftWnwEye.mirror = true;
this.setRotation(this.LeftWnwEye, 0.0F, 0.0F, 0.0F);
this.LeftWneH = new ModelRenderer(this, 40, 7);
this.LeftWneH.addBox(4.0F, -4.0F, 0.0F, 3, 2, 1);
this.LeftWneH.setRotationPoint(0.0F, 5.0F, -10.0F);
this.LeftWneH.setTextureSize(64, 32);
this.LeftWneH.mirror = true;
this.setRotation(this.LeftWneH, 0.0F, 0.0F, 0.0F);
this.LeftWneM = new ModelRenderer(this, 37, 3);
this.LeftWneM.addBox(4.0F, -6.0F, 0.0F, 2, 2, 1);
this.LeftWneM.setRotationPoint(0.0F, 5.0F, -10.0F);
this.LeftWneM.setTextureSize(64, 32);
this.LeftWneM.mirror = true;
this.setRotation(this.LeftWneM, 0.0F, 0.0F, 0.0F);
this.LeftWneV = new ModelRenderer(this, 29, 1);
this.LeftWneV.addBox(2.0F, -7.0F, 0.0F, 2, 3, 1);
this.LeftWneV.setRotationPoint(0.0F, 5.0F, -10.0F);
this.LeftWneV.setTextureSize(64, 32);
this.LeftWneV.mirror = true;
this.setRotation(this.LeftWneV, 0.0F, 0.0F, 0.0F);
this.LeftWneEye = new ModelRenderer(this, 33, 7);
this.LeftWneEye.addBox(3.0F, -4.0F, 0.0F, 1, 1, 1);
this.LeftWneEye.setRotationPoint(0.0F, 5.0F, -10.0F);
this.LeftWneEye.setTextureSize(64, 32);
this.LeftWneEye.mirror = true;
this.setRotation(this.LeftWneEye, 0.0F, 0.0F, 0.0F);
this.LeftWswH = new ModelRenderer(this, 0, 19);
this.LeftWswH.addBox(-7.0F, 2.0F, 0.0F, 3, 2, 1);
this.LeftWswH.setRotationPoint(0.0F, 5.0F, -10.0F);
this.LeftWswH.setTextureSize(64, 32);
this.LeftWswH.mirror = true;
this.setRotation(this.LeftWswH, 0.0F, 0.0F, 0.0F);
this.LeftWswM = new ModelRenderer(this, 4, 23);
this.LeftWswM.addBox(-6.0F, 4.0F, 0.0F, 2, 2, 1);
this.LeftWswM.setRotationPoint(0.0F, 5.0F, -10.0F);
this.LeftWswM.setTextureSize(64, 32);
this.LeftWswM.mirror = true;
this.setRotation(this.LeftWswM, 0.0F, 0.0F, 0.0F);
this.LeftWswV = new ModelRenderer(this, 11, 24);
this.LeftWswV.addBox(-4.0F, 4.0F, 0.0F, 2, 3, 1);
this.LeftWswV.setRotationPoint(0.0F, 5.0F, -10.0F);
this.LeftWswV.setTextureSize(64, 32);
this.LeftWswV.mirror = true;
this.setRotation(this.LeftWswV, 0.0F, 0.0F, 0.0F);
this.LeftWswEye = new ModelRenderer(this, 10, 20);
this.LeftWswEye.addBox(-4.0F, 3.0F, 0.0F, 1, 1, 1);
this.LeftWswEye.setRotationPoint(0.0F, 5.0F, -10.0F);
this.LeftWswEye.setTextureSize(64, 32);
this.LeftWswEye.mirror = true;
this.setRotation(this.LeftWswEye, 0.0F, 0.0F, 0.0F);
this.LeftWseH = new ModelRenderer(this, 40, 19);
this.LeftWseH.addBox(4.0F, 2.0F, 0.0F, 3, 2, 1);
this.LeftWseH.setRotationPoint(0.0F, 5.0F, -10.0F);
this.LeftWseH.setTextureSize(64, 32);
this.LeftWseH.mirror = true;
this.setRotation(this.LeftWseH, 0.0F, 0.0F, 0.0F);
this.LeftWseM = new ModelRenderer(this, 37, 23);
this.LeftWseM.addBox(4.0F, 4.0F, 0.0F, 2, 2, 1);
this.LeftWseM.setRotationPoint(0.0F, 5.0F, -10.0F);
this.LeftWseM.setTextureSize(64, 32);
this.LeftWseM.mirror = true;
this.setRotation(this.LeftWseM, 0.0F, 0.0F, 0.0F);
this.LeftWseV = new ModelRenderer(this, 29, 24);
this.LeftWseV.addBox(2.0F, 4.0F, 0.0F, 2, 3, 1);
this.LeftWseV.setRotationPoint(0.0F, 5.0F, -10.0F);
this.LeftWseV.setTextureSize(64, 32);
this.LeftWseV.mirror = true;
this.setRotation(this.LeftWseV, 0.0F, 0.0F, 0.0F);
this.LeftWseEye = new ModelRenderer(this, 33, 20);
this.LeftWseEye.addBox(3.0F, 3.0F, 0.0F, 1, 1, 1);
this.LeftWseEye.setRotationPoint(0.0F, 5.0F, -10.0F);
this.LeftWseEye.setTextureSize(64, 32);
this.LeftWseEye.mirror = true;
this.setRotation(this.LeftWseEye, 0.0F, 0.0F, 0.0F);
this.RightWheelAxle = new ModelRenderer(this, 117, 12);
this.RightWheelAxle.addBox(-1.0F, -1.0F, -1.0F, 2, 2, 3);
this.RightWheelAxle.setRotationPoint(0.0F, 5.0F, 9.0F);
this.RightWheelAxle.setTextureSize(64, 32);
this.RightWheelAxle.mirror = true;
this.setRotation(this.RightWheelAxle, 0.0F, 0.0F, 0.0F);
this.RightWCenterHbeam = new ModelRenderer(this, 80, 12);
this.RightWCenterHbeam.addBox(-8.0F, -2.0F, 0.0F, 16, 4, 1);
this.RightWCenterHbeam.setRotationPoint(0.0F, 5.0F, 9.0F);
this.RightWCenterHbeam.setTextureSize(64, 32);
this.RightWCenterHbeam.mirror = true;
this.setRotation(this.RightWCenterHbeam, 0.0F, 0.0F, 0.0F);
this.RightWCenterVtop = new ModelRenderer(this, 98, 0);
this.RightWCenterVtop.addBox(-2.0F, -8.0F, 0.0F, 4, 6, 1);
this.RightWCenterVtop.setRotationPoint(0.0F, 5.0F, 9.0F);
this.RightWCenterVtop.setTextureSize(64, 32);
this.RightWCenterVtop.mirror = true;
this.setRotation(this.RightWCenterVtop, 0.0F, 0.0F, 0.0F);
this.RightWCenterVbottom = new ModelRenderer(this, 98, 22);
this.RightWCenterVbottom.addBox(-2.0F, 2.0F, 0.0F, 4, 6, 1);
this.RightWCenterVbottom.setRotationPoint(0.0F, 5.0F, 9.0F);
this.RightWCenterVbottom.setTextureSize(64, 32);
this.RightWCenterVbottom.mirror = true;
this.setRotation(this.RightWCenterVbottom, 0.0F, 0.0F, 0.0F);
this.RightWnwH = new ModelRenderer(this, 79, 7);
this.RightWnwH.addBox(4.0F, -4.0F, 0.0F, 3, 2, 1);
this.RightWnwH.setRotationPoint(0.0F, 5.0F, 9.0F);
this.RightWnwH.setTextureSize(64, 32);
this.RightWnwH.mirror = true;
this.setRotation(this.RightWnwH, 0.0F, 0.0F, 0.0F);
this.RightWnwM = new ModelRenderer(this, 84, 3);
this.RightWnwM.addBox(4.0F, -6.0F, 0.0F, 2, 2, 1);
this.RightWnwM.setRotationPoint(0.0F, 5.0F, 9.0F);
this.RightWnwM.setTextureSize(64, 32);
this.RightWnwM.mirror = true;
this.setRotation(this.RightWnwM, 0.0F, 0.0F, 0.0F);
this.RightWnwV = new ModelRenderer(this, 91, 1);
this.RightWnwV.addBox(2.0F, -7.0F, 0.0F, 2, 3, 1);
this.RightWnwV.setRotationPoint(0.0F, 5.0F, 9.0F);
this.RightWnwV.setTextureSize(64, 32);
this.RightWnwV.mirror = true;
this.setRotation(this.RightWnwV, 0.0F, 0.0F, 0.0F);
this.RightWnwEye = new ModelRenderer(this, 90, 7);
this.RightWnwEye.addBox(3.0F, -4.0F, 0.0F, 1, 1, 1);
this.RightWnwEye.setRotationPoint(0.0F, 5.0F, 9.0F);
this.RightWnwEye.setTextureSize(64, 32);
this.RightWnwEye.mirror = true;
this.setRotation(this.RightWnwEye, 0.0F, 0.0F, 0.0F);
this.RoghtWneH = new ModelRenderer(this, 119, 7);
this.RoghtWneH.addBox(-7.0F, -4.0F, 0.0F, 3, 2, 1);
this.RoghtWneH.setRotationPoint(0.0F, 5.0F, 9.0F);
this.RoghtWneH.setTextureSize(64, 32);
this.RoghtWneH.mirror = true;
this.setRotation(this.RoghtWneH, 0.0F, 0.0F, 0.0F);
this.RightWneM = new ModelRenderer(this, 116, 3);
this.RightWneM.addBox(-6.0F, -6.0F, 0.0F, 2, 2, 1);
this.RightWneM.setRotationPoint(0.0F, 5.0F, 9.0F);
this.RightWneM.setTextureSize(64, 32);
this.RightWneM.mirror = true;
this.setRotation(this.RightWneM, 0.0F, 0.0F, 0.0F);
this.RightWneV = new ModelRenderer(this, 109, 1);
this.RightWneV.addBox(-4.0F, -7.0F, 0.0F, 2, 3, 1);
this.RightWneV.setRotationPoint(0.0F, 5.0F, 9.0F);
this.RightWneV.setTextureSize(64, 32);
this.RightWneV.mirror = true;
this.setRotation(this.RightWneV, 0.0F, 0.0F, 0.0F);
this.RightWneEye = new ModelRenderer(this, 113, 7);
this.RightWneEye.addBox(-4.0F, -4.0F, 0.0F, 1, 1, 1);
this.RightWneEye.setRotationPoint(0.0F, 5.0F, 9.0F);
this.RightWneEye.setTextureSize(64, 32);
this.RightWneEye.mirror = true;
this.setRotation(this.RightWneEye, 0.0F, 0.0F, 0.0F);
this.RightWswH = new ModelRenderer(this, 79, 19);
this.RightWswH.addBox(4.0F, 2.0F, 0.0F, 3, 2, 1);
this.RightWswH.setRotationPoint(0.0F, 5.0F, 9.0F);
this.RightWswH.setTextureSize(64, 32);
this.RightWswH.mirror = true;
this.setRotation(this.RightWswH, 0.0F, 0.0F, 0.0F);
this.RightWswM = new ModelRenderer(this, 84, 23);
this.RightWswM.addBox(4.0F, 4.0F, 0.0F, 2, 2, 1);
this.RightWswM.setRotationPoint(0.0F, 5.0F, 9.0F);
this.RightWswM.setTextureSize(64, 32);
this.RightWswM.mirror = true;
this.setRotation(this.RightWswM, 0.0F, 0.0F, 0.0F);
this.RightWswV = new ModelRenderer(this, 91, 24);
this.RightWswV.addBox(2.0F, 4.0F, 0.0F, 2, 3, 1);
this.RightWswV.setRotationPoint(0.0F, 5.0F, 9.0F);
this.RightWswV.setTextureSize(64, 32);
this.RightWswV.mirror = true;
this.setRotation(this.RightWswV, 0.0F, 0.0F, 0.0F);
this.RightWswEye = new ModelRenderer(this, 90, 20);
this.RightWswEye.addBox(3.0F, 3.0F, 0.0F, 1, 1, 1);
this.RightWswEye.setRotationPoint(0.0F, 5.0F, 9.0F);
this.RightWswEye.setTextureSize(64, 32);
this.RightWswEye.mirror = true;
this.setRotation(this.RightWswEye, 0.0F, 0.0F, 0.0F);
this.RightWseH = new ModelRenderer(this, 119, 19);
this.RightWseH.addBox(-7.0F, 2.0F, 0.0F, 3, 2, 1);
this.RightWseH.setRotationPoint(0.0F, 5.0F, 9.0F);
this.RightWseH.setTextureSize(64, 32);
this.RightWseH.mirror = true;
this.setRotation(this.RightWseH, 0.0F, 0.0F, 0.0F);
this.RightWseM = new ModelRenderer(this, 116, 23);
this.RightWseM.addBox(-6.0F, 4.0F, 0.0F, 2, 2, 1);
this.RightWseM.setRotationPoint(0.0F, 5.0F, 9.0F);
this.RightWseM.setTextureSize(64, 32);
this.RightWseM.mirror = true;
this.setRotation(this.RightWseM, 0.0F, 0.0F, 0.0F);
this.RightWseV = new ModelRenderer(this, 109, 24);
this.RightWseV.addBox(-4.0F, 4.0F, 0.0F, 2, 3, 1);
this.RightWseV.setRotationPoint(0.0F, 5.0F, 9.0F);
this.RightWseV.setTextureSize(64, 32);
this.RightWseV.mirror = true;
this.setRotation(this.RightWseV, 0.0F, 0.0F, 0.0F);
this.RightWseEye = new ModelRenderer(this, 113, 20);
this.RightWseEye.addBox(-4.0F, 3.0F, 0.0F, 1, 1, 1);
this.RightWseEye.setRotationPoint(0.0F, 5.0F, 9.0F);
this.RightWseEye.setTextureSize(64, 32);
this.RightWseEye.mirror = true;
this.setRotation(this.RightWseEye, 0.0F, 0.0F, 0.0F);
this.StandCenterBar = new ModelRenderer(this, 47, 27);
this.StandCenterBar.addBox(-1.0F, 0.0F, -8.0F, 1, 2, 16);
this.StandCenterBar.setRotationPoint(-9.0F, 6.0F, 0.0F);
this.StandCenterBar.setTextureSize(64, 32);
this.StandCenterBar.mirror = true;
this.setRotation(this.StandCenterBar, 0.0F, 0.0F, 0.0F);
this.StandLeft = new ModelRenderer(this, 37, 27);
this.StandLeft.addBox(-1.0F, 2.0F, -8.0F, 1, 5, 2);
this.StandLeft.setRotationPoint(-9.0F, 6.0F, 0.0F);
this.StandLeft.setTextureSize(64, 32);
this.StandLeft.mirror = true;
this.setRotation(this.StandLeft, 0.0F, 0.0F, 0.0F);
this.StandRight = new ModelRenderer(this, 84, 27);
this.StandRight.addBox(-1.0F, 2.0F, 6.0F, 1, 5, 2);
this.StandRight.setRotationPoint(-9.0F, 6.0F, 0.0F);
this.StandRight.setTextureSize(64, 32);
this.StandRight.mirror = true;
this.setRotation(this.StandRight, 0.0F, 0.0F, 0.0F);
}
/**
* Sets the models various rotation angles then renders the model.
*/
@Override
public void render(Entity var1, float var2, float var3, float var4, float var5, float var6, float var7) {
super.render(var1, var2, var3, var4, var5, var6, var7);
this.setRotationAngles(var2, var3, var4, var5, var6, var7, var1);
this.LeftWheelAxle.rotateAngleZ = this.LeftWCenterHbeam.rotateAngleZ = this.LeftWCenterVtop.rotateAngleZ = this.LeftWCenterVbottom.rotateAngleZ = this.LeftWnwH.rotateAngleZ = this.LeftWnwM.rotateAngleZ = this.LeftWnwV.rotateAngleZ = this.LeftWnwEye.rotateAngleZ = this.LeftWneH.rotateAngleZ = this.LeftWneM.rotateAngleZ = this.LeftWneV.rotateAngleZ = this.LeftWneEye.rotateAngleZ = this.LeftWswH.rotateAngleZ = this.LeftWswM.rotateAngleZ = this.LeftWswV.rotateAngleZ = this.LeftWswEye.rotateAngleZ = this.LeftWseH.rotateAngleZ = this.LeftWseM.rotateAngleZ = this.LeftWseV.rotateAngleZ = this.LeftWseEye.rotateAngleZ = this.RightWheelAxle.rotateAngleZ = this.RightWCenterHbeam.rotateAngleZ = this.RightWCenterVtop.rotateAngleZ = this.RightWCenterVbottom.rotateAngleZ = this.RightWnwH.rotateAngleZ = this.RightWnwM.rotateAngleZ = this.RightWnwV.rotateAngleZ = this.RightWnwEye.rotateAngleZ = this.RoghtWneH.rotateAngleZ = this.RightWneM.rotateAngleZ = this.RightWneV.rotateAngleZ = this.RightWneEye.rotateAngleZ = this.RightWswH.rotateAngleZ = this.RightWswM.rotateAngleZ = this.RightWswV.rotateAngleZ = this.RightWswEye.rotateAngleZ = this.RightWseH.rotateAngleZ = this.RightWseM.rotateAngleZ = this.RightWseV.rotateAngleZ = this.RightWseEye.rotateAngleZ;
this.Bottom.render(var7);
this.Left.render(var7);
this.Right.render(var7);
this.Back.render(var7);
this.Front.render(var7);
this.Leftpull.render(var7);
this.Rightpull.render(var7);
this.HandBrakeMain.render(var7);
this.HandbrakeJamb.render(var7);
this.LeftWheelAxle.render(var7);
this.LeftWCenterHbeam.render(var7);
this.LeftWCenterVtop.render(var7);
this.LeftWCenterVbottom.render(var7);
this.LeftWnwH.render(var7);
this.LeftWnwM.render(var7);
this.LeftWnwV.render(var7);
this.LeftWnwEye.render(var7);
this.LeftWneH.render(var7);
this.LeftWneM.render(var7);
this.LeftWneV.render(var7);
this.LeftWneEye.render(var7);
this.LeftWswH.render(var7);
this.LeftWswM.render(var7);
this.LeftWswV.render(var7);
this.LeftWswEye.render(var7);
this.LeftWseH.render(var7);
this.LeftWseM.render(var7);
this.LeftWseV.render(var7);
this.LeftWseEye.render(var7);
this.RightWheelAxle.render(var7);
this.RightWCenterHbeam.render(var7);
this.RightWCenterVtop.render(var7);
this.RightWCenterVbottom.render(var7);
this.RightWnwH.render(var7);
this.RightWnwM.render(var7);
this.RightWnwV.render(var7);
this.RightWnwEye.render(var7);
this.RoghtWneH.render(var7);
this.RightWneM.render(var7);
this.RightWneV.render(var7);
this.RightWneEye.render(var7);
this.RightWswH.render(var7);
this.RightWswM.render(var7);
this.RightWswV.render(var7);
this.RightWswEye.render(var7);
this.RightWseH.render(var7);
this.RightWseM.render(var7);
this.RightWseV.render(var7);
this.RightWseEye.render(var7);
this.StandCenterBar.render(var7);
this.StandLeft.render(var7);
this.StandRight.render(var7);
}
private void setRotation(ModelRenderer var1, float var2, float var3, float var4) {
var1.rotateAngleX = var2;
var1.rotateAngleY = var3;
var1.rotateAngleZ = var4;
}
/**
* Sets the models various rotation angles.
*/
@Override
public void setRotationAngles(float var1, float var2, float var3, float var4, float var5, float var6,
Entity par7Entity) {
super.setRotationAngles(var1, var2, var3, var4, var5, var6, par7Entity);
}
}
src/main/java/tconstruct/plugins/gears/TinkerGears.java
+30 -28
View File
@@ -47,39 +47,41 @@ public class TinkerGears {
}
// find all gears in the registry
for (String oreName : OreDictionary.getOreNames()) {
if (!oreName.startsWith("gear")) continue;
if (!PHConstruct.disableAllRecipes) {
for (String oreName : OreDictionary.getOreNames()) {
if (!oreName.startsWith("gear")) continue;
List<ItemStack> gears = OreDictionary.getOres(oreName);
List<ItemStack> gears = OreDictionary.getOres(oreName);
// register every gear besides wooden gear for creating a gear cast
if (!oreName.equals("gearWood")) {
for (ItemStack g : gears) {
TConstructRegistry.getTableCasting().addCastingRecipe(cast, aluCastLiquid, g, false, 50);
if (!PHConstruct.removeGoldCastRecipes)
TConstructRegistry.getTableCasting().addCastingRecipe(cast, goldCastLiquid, g, false, 50);
// register every gear besides wooden gear for creating a gear cast
if (!oreName.equals("gearWood")) {
for (ItemStack g : gears) {
TConstructRegistry.getTableCasting().addCastingRecipe(cast, aluCastLiquid, g, false, 50);
if (!PHConstruct.removeGoldCastRecipes)
TConstructRegistry.getTableCasting().addCastingRecipe(cast, goldCastLiquid, g, false, 50);
}
}
}
// find a fluid that fits the gear
String material = oreName.substring(4);
// try the oredict name directly
Fluid fluid = FluidRegistry.getFluid(material);
// or lowercased
if (fluid == null) fluid = FluidRegistry.getFluid(material.toLowerCase());
// or in the tinkers liquid format
if (fluid == null) fluid = FluidRegistry.getFluid(material.toLowerCase() + ".molten");
// find a fluid that fits the gear
String material = oreName.substring(4);
// try the oredict name directly
Fluid fluid = FluidRegistry.getFluid(material);
// or lowercased
if (fluid == null) fluid = FluidRegistry.getFluid(material.toLowerCase());
// or in the tinkers liquid format
if (fluid == null) fluid = FluidRegistry.getFluid(material.toLowerCase() + ".molten");
// found one?
if (fluid != null) {
ItemStack gear = gears.get(0);
FluidStack liquid = new FluidStack(fluid.getID(), TConstruct.ingotLiquidValue * 4);
// gear casting
TConstructRegistry.getTableCasting().addCastingRecipe(gear, liquid, cast, 55);
// and melting it back
FluidType ft = FluidType.getFluidType(fluid);
if (ft != null) Smeltery.addMelting(ft, gear, 100, TConstruct.ingotLiquidValue * 4);
else Smeltery.addMelting(gear, TinkerSmeltery.glueBlock, 0, 100, liquid);
// found one?
if (fluid != null) {
ItemStack gear = gears.get(0);
FluidStack liquid = new FluidStack(fluid.getID(), TConstruct.ingotLiquidValue * 4);
// gear casting
TConstructRegistry.getTableCasting().addCastingRecipe(gear, liquid, cast, 55);
// and melting it back
FluidType ft = FluidType.getFluidType(fluid);
if (ft != null) Smeltery.addMelting(ft, gear, 100, TConstruct.ingotLiquidValue * 4);
else Smeltery.addMelting(gear, TinkerSmeltery.glueBlock, 0, 100, liquid);
}
}
}
}
src/main/java/tconstruct/plugins/ic2/Ic2CropHarvestHandler.java
+2 -1
View File
@@ -16,7 +16,8 @@ public class Ic2CropHarvestHandler implements CropHarvestHandler {
@Override
public boolean tryHarvest(ItemStack stack, EntityPlayer player, World world, int x, int y, int z) {
return world.getTileEntity(x, y, z) instanceof ICropTile crop && crop.getCrop().canBeHarvested(crop)
return world.getTileEntity(x, y, z) instanceof ICropTile crop && crop.getCrop() != null
&& crop.getCrop().canBeHarvested(crop)
&& crop.harvest(true);
}
}
src/main/java/tconstruct/plugins/ic2/TinkerIC2.java
+9 -6
View File
@@ -14,6 +14,7 @@ import tconstruct.TConstruct;
import tconstruct.api.harvesting.CropHarvestHandlers;
import tconstruct.library.TConstructRegistry;
import tconstruct.library.crafting.LiquidCasting;
import tconstruct.util.config.PHConstruct;
@ObjectHolder(TConstruct.modID)
@Pulse(
@@ -38,11 +39,13 @@ public class TinkerIC2 {
LiquidCasting basinCasting = TConstructRegistry.getBasinCasting();
// Block casting
basinCasting.addCastingRecipe(
new ItemStack(Blocks.diamond_block),
fluidStackBlock,
new ItemStack(Blocks.dirt),
true,
50);
if (!PHConstruct.disableAllRecipes) {
basinCasting.addCastingRecipe(
new ItemStack(Blocks.diamond_block),
fluidStackBlock,
new ItemStack(Blocks.dirt),
true,
50);
}
}
}
src/main/java/tconstruct/plugins/te4/TinkerTE4.java
+12 -9
View File
@@ -18,6 +18,7 @@ import tconstruct.TConstruct;
import tconstruct.library.TConstructRegistry;
import tconstruct.smeltery.TinkerSmeltery;
import tconstruct.tools.TinkerTools;
import tconstruct.util.config.PHConstruct;
import tconstruct.world.TinkerWorld;
@ObjectHolder(TConstruct.modID)
@@ -95,15 +96,17 @@ public class TinkerTE4 {
0);
// Dust Recipes
GameRegistry.addRecipe(
new ShapelessOreRecipe(new ItemStack(TinkerTools.materials, 1, 41), "dustArdite", "dustCobalt"));
GameRegistry.addRecipe(
new ShapelessOreRecipe(
new ItemStack(TinkerTools.materials, 4, 42),
"dustAluminum",
"dustAluminum",
"dustAluminum",
"dustCopper"));
if (!PHConstruct.disableAllRecipes) {
GameRegistry.addRecipe(
new ShapelessOreRecipe(new ItemStack(TinkerTools.materials, 1, 41), "dustArdite", "dustCobalt"));
GameRegistry.addRecipe(
new ShapelessOreRecipe(
new ItemStack(TinkerTools.materials, 4, 42),
"dustAluminum",
"dustAluminum",
"dustAluminum",
"dustCopper"));
}
}
@Handler
src/main/java/tconstruct/smeltery/TinkerSmeltery.java
+7 -5
View File
@@ -610,11 +610,13 @@ public class TinkerSmeltery {
public void init(FMLInitializationEvent event) {
proxy.initialize();
loadMetalPatternMaterial();
craftingTableRecipes();
addRecipesForSmeltery();
addRecipesForTableCasting();
addRecipesForBasinCasting();
addRecipesForFurnace();
if (!PHConstruct.disableAllRecipes) {
craftingTableRecipes();
addRecipesForSmeltery();
addRecipesForTableCasting();
addRecipesForBasinCasting();
addRecipesForFurnace();
}
}
@Handler
src/main/java/tconstruct/smeltery/logic/CastingBlockLogic.java
+33 -2
View File
@@ -1,5 +1,6 @@
package tconstruct.smeltery.logic;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;
@@ -9,6 +10,7 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.NetworkManager;
import net.minecraft.network.Packet;
import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.util.ForgeDirection;
@@ -21,6 +23,7 @@ import net.minecraftforge.fluids.IFluidTank;
import cpw.mods.fml.common.eventhandler.Event;
import mantle.blocks.abstracts.InventoryLogic;
import mantle.blocks.iface.IFacingLogic;
import tconstruct.TConstruct;
import tconstruct.library.crafting.CastingRecipe;
import tconstruct.library.crafting.LiquidCasting;
@@ -30,9 +33,11 @@ import tconstruct.library.event.SmelteryEvent;
import tconstruct.library.tools.AbilityHelper;
import tconstruct.library.util.IPattern;
public abstract class CastingBlockLogic extends InventoryLogic implements IFluidTank, IFluidHandler, ISidedInventory {
public abstract class CastingBlockLogic extends InventoryLogic
implements IFluidTank, IFluidHandler, ISidedInventory, IFacingLogic {
public FluidStack liquid;
protected byte direction;
protected int maxCastingDelay = 0;
protected int castingDelay = 0;
protected int renderOffset = 0;
@@ -289,7 +294,7 @@ public abstract class CastingBlockLogic extends InventoryLogic implements IFluid
player);
MinecraftForge.EVENT_BUS.post(event);
// try to transfer thes tack to the player inventory
// try to transfer the stack to the player inventory
ItemStack output = event.item;
AbilityHelper.spawnItemAtPlayer(player, output);
@@ -431,6 +436,7 @@ public abstract class CastingBlockLogic extends InventoryLogic implements IFluid
this.castingDelay = tags.getInteger("castingDelay");
this.maxCastingDelay = tags.getInteger("maxCastingDelay");
this.renderOffset = tags.getInteger("RenderOffset");
this.direction = tags.getByte("direction");
}
@Override
@@ -451,6 +457,7 @@ public abstract class CastingBlockLogic extends InventoryLogic implements IFluid
tags.setInteger("castingDelay", castingDelay);
tags.setInteger("maxCastingDelay", maxCastingDelay);
tags.setInteger("RenderOffset", renderOffset);
tags.setByte("direction", direction);
}
/* Packets */
@@ -474,4 +481,28 @@ public abstract class CastingBlockLogic extends InventoryLogic implements IFluid
return (int) (((maxCastingDelay - castingDelay) / (double) maxCastingDelay) * 100);
}
@Override
public byte getRenderDirection() {
return direction;
}
@Override
public ForgeDirection getForgeDirection() {
return ForgeDirection.VALID_DIRECTIONS[direction];
}
@Override
public void setDirection(int side) {}
@Override
public void setDirection(float yaw, float pitch, EntityLivingBase player) {
int facing = MathHelper.floor_double((double) (yaw / 360) + 0.5D) & 3;
switch (facing) {
case 1 -> direction = 5;
case 2 -> direction = 3;
case 3 -> direction = 4;
default -> direction = 2;
}
}
}
src/main/java/tconstruct/smeltery/logic/FaucetLogic.java
+11 -7
View File
@@ -6,6 +6,7 @@ import net.minecraft.network.NetworkManager;
import net.minecraft.network.Packet;
import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MathHelper;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
@@ -18,7 +19,7 @@ import tconstruct.TConstruct;
public class FaucetLogic extends TileEntity implements IFacingLogic, IActiveLogic, IFluidHandler {
byte direction;
byte direction = 0;
boolean active;
public FluidStack liquid;
public boolean hasRedstonePower = false;
@@ -91,17 +92,20 @@ public class FaucetLogic extends TileEntity implements IFacingLogic, IActiveLogi
public void setDirection(int side) {
if (side != 0 && side != 1) {
direction = (byte) side;
} else {
direction = 2;
}
}
@Override
public void setDirection(float yaw, float pitch, EntityLivingBase player) {
/*
* int facing = MathHelper.floor_double((double) (yaw / 360) + 0.5D) & 3; switch (facing) { case 0: direction =
* 2; break; case 1: direction = 5; break; case 2: direction = 3; break; case 3: direction = 4; break; }
*/
if (direction > 1) return;
int facing = MathHelper.floor_double((double) (yaw / 360) + 0.5D) & 3;
switch (facing) {
case 1 -> direction = 5;
case 2 -> direction = 3;
case 3 -> direction = 4;
default -> direction = 2;
}
}
@Override
src/main/java/tconstruct/smeltery/model/CastingBasinSpecialRender.java
+11 -2
View File
@@ -47,11 +47,20 @@ public class CastingBasinSpecialRender extends TileEntitySpecialRenderer {
entityitem.hoverStart = 0.0F;
GL11.glPushMatrix();
GL11.glTranslatef(1F, 0.675F, 1.0F);
// GL11.glRotatef(90F, 1, 0F, 0F);
float rotationY = switch (logic.getRenderDirection()) {
case 2 -> 90F;
case 3 -> 270F;
case 4 -> 180F;
default -> 0F;
};
GL11.glRotatef(rotationY, 0F, 1F, 0F);
GL11.glScalef(1.75F, 1.75F, 1.75F);
if (stack.getItem() instanceof ItemBlock) {
GL11.glScalef(1.6F, 1.6F, 1.6F);
GL11.glTranslatef(0F, 0.045F, 0.0f);
GL11.glTranslatef(0F, 0.045F, 0F);
} else if (!(stack.getItem() instanceof ItemBlocklike)) {
GL11.glRotatef(90F, 1F, 0F, 0F);
GL11.glRotatef(90F, 0F, 0F, 1F);
src/main/java/tconstruct/smeltery/model/CastingTableSpecialRenderer.java
+22 -3
View File
@@ -53,11 +53,30 @@ public class CastingTableSpecialRenderer extends TileEntitySpecialRenderer {
entityitem.hoverStart = 0.0F;
GL11.glPushMatrix();
GL11.glTranslatef(1F, 1.48F, 0.55F);
GL11.glRotatef(90F, 1, 0F, 0F);
float rotationY = switch (logic.getRenderDirection()) {
case 3 -> 180F;
case 4 -> 90F;
case 5 -> 270F;
default -> 0F;
};
GL11.glRotatef(rotationY, 0F, 1F, 0F);
if (logic.getRenderDirection() == 3) {
GL11.glTranslatef(0F, 0F, -0.9F);
} else if (logic.getRenderDirection() == 4) {
GL11.glTranslatef(-0.45F, 0F, -0.45F);
} else if (logic.getRenderDirection() == 5) {
GL11.glTranslatef(0.45F, 0F, -0.45F);
}
GL11.glRotatef(90F, 1F, 0F, 0F);
GL11.glScalef(2F, 2F, 2F);
if (stack.getItem() instanceof ItemBlock || stack.getItem() instanceof ItemBlocklike) {
GL11.glRotatef(90F, -1, 0F, 0F);
GL11.glTranslatef(0F, -0.1F, 0.2275F);
GL11.glRotatef(-90F, 0F, 0F, 1F);
GL11.glRotatef(90F, -1F, 0F, 0F);
GL11.glTranslatef(-0.2275F, -0.1F, 0F);
}
if (stack.isItemEqual(new ItemStack(TinkerSmeltery.glassPane))) {
src/main/java/tconstruct/tools/TinkerTools.java
+5 -3
View File
@@ -521,9 +521,11 @@ public class TinkerTools {
@Handler
public void init(FMLInitializationEvent event) {
addPartMapping();
addRecipesForToolBuilder();
addRecipesForChisel();
craftingTableRecipes();
if (!PHConstruct.disableAllRecipes) {
addRecipesForToolBuilder();
addRecipesForChisel();
craftingTableRecipes();
}
setupToolTabs();
proxy.initialize();
}
src/main/java/tconstruct/tools/logic/ToolForgeLogic.java
-12
View File
@@ -6,12 +6,10 @@ import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import tconstruct.TConstruct;
import tconstruct.library.crafting.ModifyBuilder;
import tconstruct.library.crafting.ToolBuilder;
import tconstruct.library.modifier.IModifyable;
import tconstruct.tools.inventory.ToolForgeContainer;
import tconstruct.util.network.ToolStationPacket;
/*
* Simple class for storing items in the block
@@ -67,15 +65,5 @@ public class ToolForgeLogic extends ToolStationLogic implements ISidedInventory
output = tryRenameTool(output, name);
}
inventory[0] = output;
if (output != null && output.hasDisplayName()) {
TConstruct.packetPipeline
.sendToServer(new ToolStationPacket(xCoord, yCoord, zCoord, output.getDisplayName()));
}
}
/*
* public void buildTool (String name) { toolName = name; ItemStack tool =
* ToolBuilder.instance.buildTool(inventory[1], inventory[2], inventory[3], inventory[4], name); if (inventory[0] ==
* null) inventory[0] = tool; else { NBTTagCompound tags = inventory[0].getTagCompound(); if
* (!tags.getCompoundTag("InfiTool").hasKey("Built")) { inventory[0] = tool; } } }
*/
}
src/main/java/tconstruct/tools/logic/ToolStationLogic.java
+23 -19
View File
@@ -9,12 +9,10 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import mantle.blocks.abstracts.InventoryLogic;
import tconstruct.TConstruct;
import tconstruct.library.crafting.ModifyBuilder;
import tconstruct.library.crafting.ToolBuilder;
import tconstruct.library.modifier.IModifyable;
import tconstruct.tools.inventory.ToolStationContainer;
import tconstruct.util.network.ToolStationPacket;
/*
* Simple class for storing items in the block
@@ -55,9 +53,25 @@ public class ToolStationLogic extends InventoryLogic implements ISidedInventory
return new ToolStationContainer(inventoryplayer, this);
}
@Override
public void setInventorySlotContents(int slot, ItemStack stack) {
super.setInventorySlotContents(slot, stack);
if (slot != 0) {
buildTool(toolName);
}
}
@Override
public ItemStack decrStackSize(int slot, int amount) {
ItemStack itemstack = super.decrStackSize(slot, amount);
if (slot != 0) {
buildTool(toolName);
}
return itemstack;
}
@Override
public void markDirty() {
buildTool(toolName);
if (this.worldObj != null) {
this.blockMetadata = this.worldObj.getBlockMetadata(this.xCoord, this.yCoord, this.zCoord);
this.worldObj.markTileEntityChunkModified(this.xCoord, this.yCoord, this.zCoord, this);
@@ -91,10 +105,6 @@ public class ToolStationLogic extends InventoryLogic implements ISidedInventory
output = tryRenameTool(output, name);
}
inventory[0] = output;
if (output != null && output.hasDisplayName()) {
TConstruct.packetPipeline
.sendToServer(new ToolStationPacket(xCoord, yCoord, zCoord, output.getDisplayName()));
}
}
public void setToolname(String name) {
@@ -107,10 +117,6 @@ public class ToolStationLogic extends InventoryLogic implements ISidedInventory
if (output != null) temp = output;
else temp = inventory[1].copy();
if (temp == null) {
return null; // output is null or not a tool :(
}
NBTTagCompound tags = temp.getTagCompound();
if (tags == null) {
tags = new NBTTagCompound();
@@ -118,17 +124,16 @@ public class ToolStationLogic extends InventoryLogic implements ISidedInventory
}
NBTTagCompound display = null;
if (!(tags.hasKey("display"))) display = new NBTTagCompound();
else if (tags.getCompoundTag("display").hasKey("Name")) display = tags.getCompoundTag("display");
if (display == null) return output;
if (tags.hasKey("display") && tags.getCompoundTag("display").hasKey("Name"))
display = tags.getCompoundTag("display");
boolean doRename = false;
if (canRename(display, temp)) {
if (display == null) {
display = new NBTTagCompound();
doRename = true;
}
// we only allow renaming with a nametag otherwise
else if (!("\u00A7f" + name).equals(display.getString("Name")) && !name.equals(display.getString("Name"))) {
else if (!name.equals(display.getString("Name"))) {
int nametagCount = 0;
for (ItemStack itemStack : inventory)
if (itemStack != null && itemStack.getItem() == Items.name_tag) nametagCount++;
@@ -138,8 +143,7 @@ public class ToolStationLogic extends InventoryLogic implements ISidedInventory
if (!doRename) return output;
String dName = temp.getItem() instanceof IModifyable ? "\u00A7f" + name : name;
display.setString("Name", dName);
display.setString("Name", name);
tags.setTag("display", display);
temp.setRepairCost(2);
output = temp;
src/main/java/tconstruct/util/config/PHConstruct.java
+7
View File
@@ -226,6 +226,11 @@ public class PHConstruct {
true,
"Allow stacks of essence berries to be consumed at once when shifting (this does not spawn XP orbs in world).")
.getBoolean();
disableAllRecipes = config.get(
"general",
"Disable All Recipes",
false,
"Disable all TiC recipes (smeltery, drying rack, crafting, etc)").getBoolean();
enableHealthRegen = config.get("Ultra Hardcore Changes", "Passive Health Regen", true).getBoolean(true);
goldAppleRecipe = config.get(
@@ -431,6 +436,8 @@ public class PHConstruct {
public static boolean consumeXPBerryStacks;
public static boolean disableAllRecipes;
// Mobs
public static int naturalSlimeSpawn;
src/main/java/tconstruct/weaponry/TinkerWeaponry.java
+4 -2
View File
@@ -135,8 +135,10 @@ public class TinkerWeaponry {
@Handler
public void init(FMLInitializationEvent event) {
addPartRecipies();
addWeaponRecipies();
if (!PHConstruct.disableAllRecipes) {
addPartRecipies();
addWeaponRecipies();
}
setupCreativeTab();
// Modifiers
src/main/java/tconstruct/weaponry/weapons/Crossbow.java
+5 -3
View File
@@ -12,7 +12,8 @@ import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import cpw.mods.fml.common.Loader;
import mods.battlegear2.api.core.IInventoryPlayerBattle;
import mods.battlegear2.api.core.IBattlePlayer;
import tconstruct.compat.Battlegear2Compat;
import tconstruct.library.TConstructRegistry;
import tconstruct.library.crafting.ToolBuilder;
import tconstruct.library.tools.AbilityHelper;
@@ -224,8 +225,9 @@ public class Crossbow extends ProjectileWeapon {
@Override
public ItemStack searchForAmmo(EntityPlayer player, ItemStack weapon) {
// arrow priority: hotbar > inventory, tinker arrows > regular arrows
if (isBattlegear2Loaded) {
ItemStack offhand = ((IInventoryPlayerBattle) player.inventory).battlegear2$getCurrentOffhandWeapon();
if (isBattlegear2Loaded && player instanceof IBattlePlayer battlePlayer
&& battlePlayer.battlegear2$isBattlemode()) {
ItemStack offhand = Battlegear2Compat.getBattlegear2Offhand(player);
if (offhand != null && (offhand.getItem() instanceof BoltAmmo)
&& ((IAmmo) offhand.getItem()).getAmmoCount(offhand) > 0) {
return offhand;
src/main/java/tconstruct/world/TinkerWorld.java
+24 -21
View File
@@ -242,8 +242,10 @@ public class TinkerWorld {
TinkerWorld.oreGravel.setHarvestLevel("shovel", 1, 4);
TinkerWorld.oreGravel.setHarvestLevel("shovel", 4, 5);
// Rail
TinkerWorld.woodenRail = new WoodRail().setStepSound(Block.soundTypeWood)
.setCreativeTab(TConstructRegistry.blockTab).setBlockName("rail.wood");
if (!Loader.isModLoaded("dreamcraft")) {
TinkerWorld.woodenRail = new WoodRail().setStepSound(Block.soundTypeWood)
.setCreativeTab(TConstructRegistry.blockTab).setBlockName("rail.wood");
}
GameRegistry.registerBlock(TinkerWorld.meatBlock, HamboneItemBlock.class, "MeatBlock");
OreDictionary.registerOre("hambone", new ItemStack(TinkerWorld.meatBlock));
@@ -291,7 +293,9 @@ public class TinkerWorld {
GameRegistry.registerBlock(TinkerWorld.oreGravel, GravelOreItem.class, "GravelOre");
// Rail
GameRegistry.registerBlock(TinkerWorld.woodenRail, "rail.wood");
if (TinkerWorld.woodenRail != null) {
GameRegistry.registerBlock(TinkerWorld.woodenRail, "rail.wood");
}
// Items
goldHead = new GoldenHead(4, 1.2F, false).setAlwaysEdible().setPotionEffect(Potion.regeneration.id, 10, 0, 1.0F)
@@ -315,9 +319,6 @@ public class TinkerWorld {
Items.iron_door.setMaxStackSize(16);
Items.boat.setMaxStackSize(16);
Items.minecart.setMaxStackSize(3);
// Items.minecartEmpty.setMaxStackSize(3);
// Items.minecartCrate.setMaxStackSize(3);
// Items.minecartPowered.setMaxStackSize(3);
Items.cake.setMaxStackSize(16);
// Block.torchWood.setTickRandomly(false);
@@ -331,8 +332,10 @@ public class TinkerWorld {
@Handler
public void init(FMLInitializationEvent event) {
craftingTableRecipes();
addRecipesForFurnace();
if (!PHConstruct.disableAllRecipes) {
craftingTableRecipes();
addRecipesForFurnace();
}
addLoot();
createEntities();
proxy.initialize();
@@ -350,8 +353,6 @@ public class TinkerWorld {
EntityRegistry.registerModEntity(Crystal.class, "Crystal", 2, TConstruct.instance, 32, 3, true);
EntityRegistry.registerModEntity(LaunchedPotion.class, "Launched Potion", 3, TConstruct.instance, 32, 3, true);
EntityRegistry.registerModEntity(ArrowEntity.class, "Arrow", 4, TConstruct.instance, 32, 5, true);
// EntityRegistry.registerModEntity(CartEntity.class, "Small Wagon", 1,
// TConstruct.instance, 32, 5, true);
EntityRegistry.registerModEntity(BlueSlime.class, "EdibleSlime", 12, TConstruct.instance, 64, 5, true);
EntityRegistry.registerModEntity(KingBlueSlime.class, "KingSlime", 14, TConstruct.instance, 64, 5, true);
@@ -681,17 +682,19 @@ public class TinkerWorld {
// Stone Ladder Recipe
GameRegistry.addRecipe(
new ShapedOreRecipe(new ItemStack(TinkerWorld.stoneLadder, 3), "w w", "www", "w w", 'w', "rodStone"));
// Wooden Rail Recipe
GameRegistry.addRecipe(
new ShapedOreRecipe(
new ItemStack(TinkerWorld.woodenRail, 4, 0),
"b b",
"bxb",
"b b",
'b',
"plankWood",
'x',
"stickWood"));
// Wooden Rail (if registered) Recipe
if (TinkerWorld.woodenRail != null) {
GameRegistry.addRecipe(
new ShapedOreRecipe(
new ItemStack(TinkerWorld.woodenRail, 4, 0),
"b b",
"bxb",
"b b",
'b',
"plankWood",
'x',
"stickWood"));
}
// Stonesticks Recipes
GameRegistry.addRecipe(new ItemStack(TinkerTools.toolRod, 4, 1), "c", "c", 'c', new ItemStack(Blocks.stone));
GameRegistry
src/main/java/tconstruct/world/TinkerWorldProxyClient.java
-3
View File
@@ -35,10 +35,8 @@ import net.minecraft.util.ResourceLocation;
import cpw.mods.fml.client.registry.RenderingRegistry;
import cpw.mods.fml.common.registry.VillagerRegistry;
import mantle.lib.client.MantleClientRegistry;
import tconstruct.mechworks.model.CartRender;
import tconstruct.tools.TinkerTools;
import tconstruct.world.entity.BlueSlime;
import tconstruct.world.entity.CartEntity;
import tconstruct.world.entity.KingBlueSlime;
import tconstruct.world.model.BarricadeRender;
import tconstruct.world.model.OreberryRender;
@@ -69,7 +67,6 @@ public class TinkerWorldProxyClient extends TinkerWorldProxyCommon {
SlimeRender slimeRender = new SlimeRender(new ModelSlime(16), new ModelSlime(0), 0.25F);
RenderingRegistry.registerEntityRenderingHandler(BlueSlime.class, slimeRender);
RenderingRegistry.registerEntityRenderingHandler(KingBlueSlime.class, slimeRender);
RenderingRegistry.registerEntityRenderingHandler(CartEntity.class, new CartRender());
VillagerRegistry.instance()
.registerVillagerSkin(78943, new ResourceLocation("tinker", "textures/mob/villagertools.png"));
src/main/java/tconstruct/world/entity/CartEntity.java
-1237
View File
File diff suppressed because it is too large. Load diff
src/main/resources/assets/tinker/manuals/en_US/diary.xml
+10 -23
View File
@@ -4,7 +4,7 @@
<page type="text">
<text>Tinker's Log #1:
Today is a new day. I finally left home and decided to wander around in the wilderness until I find a good place to call my home.
Today is a new day. I finally left home and decided to wander around in the wilderness until I find a good place to call my home.
Tinker's Log #2:
@@ -66,7 +66,7 @@ Perhaps making a tool completely out of stone wasn't the best idea. It didn't la
<page type="text">
<text>Tinker's Log #13:
I wanted to make a few more tools, but the boards with tool shapes in them went everywhere! I ended up breaking a few out of frustration. They don't fit very well in my chest either. I took a few of them, added a few slots to the bottom of the chest, placed it by my table and called it good.
I wanted to make a few more tools, but the boards with tool shapes in them went everywhere! I ended up breaking a few out of frustration. They don't fit very well in my chest either. I took a few of them, added a few slots to the bottom of the chest, placed it by my table and called it good.
I also named them "Patterns", the chest a "Pattern Chest". I'm still angry at them, and it took so long to make new ones...</text>
</page>
@@ -74,7 +74,7 @@ I also named them "Patterns", the chest a "Pattern Chest". I'm still angry at th
<page type="text">
<text>Tinker's Log #14
Today I learned just how hard it was to shape iron. First you have to dig it out of the earth. A wooden pickaxe will shatter the ore; this I found out the hard way. Once you do get that ore there isn't much to do with it besides throw it in the furnace. Melting the iron and the stone seems inefficient, but I do need the metal more than I care about the waste.
Today I learned just how hard it was to shape iron. First you have to dig it out of the earth. A wooden pickaxe will shatter the ore; this I found out the hard way. Once you do get that ore there isn't much to do with it besides throw it in the furnace. Melting the iron and the stone seems inefficient, but I do need the metal more than I care about the waste.
I shaped a few of the bars into tools, and they felt strong. Much stronger, in fact, than the ones back at the village. I've named the pickaxe "Krug" after some of the stories Nana used to tell me at night. How I miss her...</text>
</page>
@@ -92,7 +92,7 @@ A week later and I've finally found some others to visit. Some of them seem nice
<page type="text">
<text>Tinker's Log #17:
After three days and nights of fending off zombies, I've finally created a house. It has a few rooms, a basement, but most importantly a workshop. All of the tables and patterns I had before are here, as well as a few others I wanted to try out from the trip.
After three days and nights of fending off zombies, I've finally created a house. It has a few rooms, a basement, but most importantly a workshop. All of the tables and patterns I had before are here, as well as a few others I wanted to try out from the trip.
There's a round one I can cook food with and one that's just as good as any hoe, but can chop trees or actually dig the ground up. The villagers tell me these are named "Frying Pan" and "Mattock". The Frying Pan seems heavy enough to smack creepers with. I have a sword named "Shimmer" that I want to alter somehow.</text>
</page>
@@ -106,7 +106,7 @@ One of the villagers was kind enough to give me some random things. Each one loo
<page type="text">
<text>Tinker's Log #19:
After some heavy experimentation, I've ended up with some things that look amazing and others that look less useful than they actually are. A diamond tip on a pickaxe makes for a wonderfully hard mining tool, and an emerald on a sword hilt somehow makes it stay together longer, but some things don't do anything.
After some heavy experimentation, I've ended up with some things that look amazing and others that look less useful than they actually are. A diamond tip on a pickaxe makes for a wonderfully hard mining tool, and an emerald on a sword hilt somehow makes it stay together longer, but some things don't do anything.
Adding flowers to a tool does nothing; they don't even stay on the thing. Mushrooms have a similar effect, and adding more material to a tool just makes it heavier. You wouldn't think redstone would do anything. I've coated a shovel so much that it looks deep red. However, it slides through dirt as if the dirt wasn't there.</text>
</page>
@@ -132,36 +132,23 @@ I have some ideas for creating tools, but for that I need a large place to creat
<page type="text">
<text>Tinker's Log #23:
Today I made something strange. It's round, wooden, and doesn't look like anything I've ever seen. Someone came by and said it was a "wheel" and that they were great fun to roll around. I wonder what else it could be used for?
I have all these tools laying around with little notes on what each one does. Instead of leaving them scattered about, I think I will create one place to store them.
Tinker's Log #24:
I made a few more of the wheels to get some practice in. I had some fun rolling them around, rolling them in pairs, and then one ended up beside my boat. It just looked so natural I had to start putting them together.</text>
I went exploring and found some new ores today. They're colors I've never seen before, and they don't shatter on impact like iron does. I wonder what I can do with these?</text>
</page>
<page type="text">
<text>Tinker's Log #25:
I think I'm on to something here. Combining the boat with the wheel made it work something like a minecart, only I can pull it around places. It feels a little small though.
Tinker's Log #26:
I have all these tools laying around with little notes on what each one does. Instead of leaving them scattered about, I think I will create one place to store them.</text>
</page>
<page type="text">
<text>Tinker's Log #27:
I went exploring and found some new ores today. They're colors I've never seen before, and they don't shatter on impact like iron does. I wonder what I can do with these?
Tinker's Log #28:
The normal furnace is nice for keeping warm, but it leaves something to be desired for processing metal. I've dug a pit and lined it with some clay, gathered lava nearby, and put ore in the center in an attempt to improve on the design. The results were quite interesting.</text>
</page>
<page type="text">
<text>The more lava I fed into the pit the hotter the material became. Eventually the whole thing liquified. I broke open the side of the pit with a cauldron in an attempt to catch the material, but it went everywhere. There were some remnants left in the pit as well.
<text>
The more lava I fed into the pit the hotter the material became. Eventually the whole thing liquified. I broke open the side of the pit with a cauldron in an attempt to catch the material, but it went everywhere. There were some remnants left in the pit as well.
Raw ore still has parts of stone in it. There must be a way to remove the excess.</text>
</page>
</book>
</book>