diff options
| -rw-r--r-- | .classpath | 8 | ||||
| -rw-r--r-- | .gradle/2.0/taskArtifacts/cache.properties.lock | bin | 17 -> 17 bytes | |||
| -rw-r--r-- | .gradle/2.0/taskArtifacts/fileHashes.bin | bin | 2043136 -> 2043584 bytes | |||
| -rw-r--r-- | .gradle/2.0/taskArtifacts/fileSnapshots.bin | bin | 8496980 -> 10483607 bytes | |||
| -rw-r--r-- | .gradle/2.0/taskArtifacts/outputFileStates.bin | bin | 20432 -> 20432 bytes | |||
| -rw-r--r-- | .gradle/2.0/taskArtifacts/taskArtifacts.bin | bin | 59331 -> 64644 bytes | |||
| -rw-r--r-- | .gradle/gradle.log | 32 | ||||
| -rw-r--r-- | .settings/org.eclipse.jdt.core.prefs | 2 | ||||
| -rw-r--r-- | src/main/java/gmail/Lance5057/blocks/CrestMount.java | 37 | ||||
| -rw-r--r-- | src/main/java/gmail/Lance5057/blocks/ModelCrestMount.java | 9 | ||||
| -rw-r--r-- | src/main/java/gmail/Lance5057/blocks/Renderer_CrestMount.java | 31 | ||||
| -rw-r--r-- | src/main/java/gmail/Lance5057/com/mod_TinkersDefense.java | 5 |
12 files changed, 66 insertions, 58 deletions
@@ -4,7 +4,7 @@ <classpathentry excluding="assets/tinker/textures/blocks/" kind="src" path="src/main/resources"/> <classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="src" path="src/api/java"/> - <classpathentry exported="true" kind="lib" path="C:/Users/T/.gradle/caches/minecraft/net/minecraftforge/forge/1.7.10-10.13.2.1277/forgeBin-1.7.10-10.13.2.1277.jar"/> + <classpathentry exported="true" kind="lib" path="C:/Users/T/.gradle/caches/minecraft/net/minecraftforge/forge/1.7.10-10.13.2.1277/forgeSrc-1.7.10-10.13.2.1277.jar" sourcepath="C:/Users/T/.gradle/caches/minecraft/net/minecraftforge/forge/1.7.10-10.13.2.1277/forgeSrc-1.7.10-10.13.2.1277-sources.jar"/> <classpathentry exported="true" kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/net.minecraft/launchwrapper/1.11/9c0592c6e1e9ea296a70948081bd4cc84dda1289/launchwrapper-1.11.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/net.minecraft/launchwrapper/1.11/ea64c0bce5e9f465cd56566530133331568d2157/launchwrapper-1.11-sources.jar"/> <classpathentry exported="true" kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/1.3.9/40719ea6961c0cb6afaeb6a921eaa1f6afd4cfdf/jsr305-1.3.9.jar"/> <classpathentry exported="true" kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-debug-all/5.0.3/f9e364ae2a66ce2a543012a4668856e84e5dab74/asm-debug-all-5.0.3.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-debug-all/5.0.3/f0f24f6666c1a15c7e202e91610476bd4ce59368/asm-debug-all-5.0.3-sources.jar"/> @@ -64,9 +64,9 @@ <classpathentry exported="true" kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.3.2/90a3822c38ec8c996e84c16a3477ef632cbc87a3/commons-lang3-3.3.2.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.3.2/d2a489573c0ed2c4942b3660decad5d65087b406/commons-lang3-3.3.2-sources.jar"/> <classpathentry exported="true" kind="lib" path="C:/Users/T/Desktop/Minecraft Modding/1.7.10/Tinkers-Defense/libs/1.7.10-Battlegear-Bin-1.0.6.3.jar"/> <classpathentry exported="true" kind="lib" path="C:/Users/T/Desktop/Minecraft Modding/1.7.10/Tinkers-Defense/libs/Mantle-1.7.10-0.3.2.DEV.GITBORK-deobf.jar"/> + <classpathentry exported="true" kind="lib" path="C:/Users/T/Desktop/Minecraft Modding/1.7.10/Tinkers-Defense/libs/TConstruct-1.7.10-1.8.2.DEV.GITBORK-deobf.jar"/> + <classpathentry exported="true" kind="lib" path="C:/Users/T/Desktop/Minecraft Modding/1.7.10/Tinkers-Defense/libs/TConstruct-1.7.10-1.8.2.DEV.GITBORK-lib.jar"/> + <classpathentry exported="true" kind="lib" path="C:/Users/T/Desktop/Minecraft Modding/1.7.10/Tinkers-Defense/libs/TConstruct-1.7.10-1.8.2.DEV.GITBORK-sources.jar"/> <classpathentry exported="true" kind="lib" path="C:/Users/T/.gradle/caches/minecraft/net/minecraftforge/forge/1.7.10-10.13.2.1277/start"/> - <classpathentry kind="lib" path="libs/TConstruct-1.7.10-1.8.2.DEV.GITBORK-deobf.jar" sourcepath="libs/TConstruct-1.7.10-1.8.2.DEV.GITBORK-sources.jar"/> - <classpathentry kind="lib" path="libs/TConstruct-1.7.10-1.8.2.DEV.GITBORK-lib.jar"/> - <classpathentry kind="lib" path="jars/mods"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/.gradle/2.0/taskArtifacts/cache.properties.lock b/.gradle/2.0/taskArtifacts/cache.properties.lock Binary files differindex 94c03be..fed6035 100644 --- a/.gradle/2.0/taskArtifacts/cache.properties.lock +++ b/.gradle/2.0/taskArtifacts/cache.properties.lock diff --git a/.gradle/2.0/taskArtifacts/fileHashes.bin b/.gradle/2.0/taskArtifacts/fileHashes.bin Binary files differindex 9851f55..dc00ceb 100644 --- a/.gradle/2.0/taskArtifacts/fileHashes.bin +++ b/.gradle/2.0/taskArtifacts/fileHashes.bin diff --git a/.gradle/2.0/taskArtifacts/fileSnapshots.bin b/.gradle/2.0/taskArtifacts/fileSnapshots.bin Binary files differindex 2b2f4a2..bfdd6b4 100644 --- a/.gradle/2.0/taskArtifacts/fileSnapshots.bin +++ b/.gradle/2.0/taskArtifacts/fileSnapshots.bin diff --git a/.gradle/2.0/taskArtifacts/outputFileStates.bin b/.gradle/2.0/taskArtifacts/outputFileStates.bin Binary files differindex 32b57d4..a15dc1c 100644 --- a/.gradle/2.0/taskArtifacts/outputFileStates.bin +++ b/.gradle/2.0/taskArtifacts/outputFileStates.bin diff --git a/.gradle/2.0/taskArtifacts/taskArtifacts.bin b/.gradle/2.0/taskArtifacts/taskArtifacts.bin Binary files differindex f640fdc..235275a 100644 --- a/.gradle/2.0/taskArtifacts/taskArtifacts.bin +++ b/.gradle/2.0/taskArtifacts/taskArtifacts.bin diff --git a/.gradle/gradle.log b/.gradle/gradle.log index 6c8542a..ce56175 100644 --- a/.gradle/gradle.log +++ b/.gradle/gradle.log @@ -5,33 +5,11 @@ R4wk, ZeuX, IngisKahn, bspkrs MCP Data version : unknown **************************** -:downloadClient SKIPPED -:downloadServer SKIPPED -:getVersionJson -:extractUserDev UP-TO-DATE -:mergeJars SKIPPED -:applyBinPatches SKIPPED -:downloadMcpTools SKIPPED -:extractMcpData UP-TO-DATE -:genSrgs SKIPPED -:deobfBinJar SKIPPED -:compileApiJava UP-TO-DATE -:processApiResources UP-TO-DATE -:apiClasses UP-TO-DATE -:sourceMainJava UP-TO-DATE -:compileJava UP-TO-DATE -:processResources -:classes -:jar -:compileTestJava UP-TO-DATE -:processTestResources UP-TO-DATE -:testClasses UP-TO-DATE -:test UP-TO-DATE -:reobf -:assemble -:check UP-TO-DATE -:build +:eclipseClasspath +:eclipseJdt +:eclipseProject +:eclipse BUILD SUCCESSFUL -Total time: 40.356 secs +Total time: 35.126 secs diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 427f511..fbe4f41 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,5 @@ # -#Thu Jan 22 15:30:02 CST 2015 +#Thu Feb 05 23:10:40 CST 2015 org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve diff --git a/src/main/java/gmail/Lance5057/blocks/CrestMount.java b/src/main/java/gmail/Lance5057/blocks/CrestMount.java index a318c77..66f0762 100644 --- a/src/main/java/gmail/Lance5057/blocks/CrestMount.java +++ b/src/main/java/gmail/Lance5057/blocks/CrestMount.java @@ -1,9 +1,17 @@ package gmail.Lance5057.blocks; +import static net.minecraftforge.common.util.ForgeDirection.EAST; +import static net.minecraftforge.common.util.ForgeDirection.NORTH; +import static net.minecraftforge.common.util.ForgeDirection.SOUTH; +import static net.minecraftforge.common.util.ForgeDirection.WEST; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.tileentity.TileEntityFurnace; +import net.minecraft.util.MathHelper; import net.minecraft.world.World; public class CrestMount extends BlockContainer { @@ -40,4 +48,31 @@ public class CrestMount extends BlockContainer { public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { return new TileEntity_CrestMount(); } -} + + @Override + public int onBlockPlaced(World p_149660_1_, int p_149660_2_, int p_149660_3_, int p_149660_4_, int p_149660_5_, float p_149660_6_, float p_149660_7_, float p_149660_8_, int p_149660_9_) + { + int j1 = p_149660_9_; + + if ((p_149660_9_ == 0 || p_149660_5_ == 2) && p_149660_1_.isSideSolid(p_149660_2_, p_149660_3_, p_149660_4_ + 1, NORTH)) + { + j1 = 1; + } + + if ((j1 == 0 || p_149660_5_ == 3) && p_149660_1_.isSideSolid(p_149660_2_, p_149660_3_, p_149660_4_ - 1, SOUTH)) + { + j1 = 2; + } + + if ((j1 == 0 || p_149660_5_ == 4) && p_149660_1_.isSideSolid(p_149660_2_ + 1, p_149660_3_, p_149660_4_, WEST)) + { + j1 = 3; + } + + if ((j1 == 0 || p_149660_5_ == 5) && p_149660_1_.isSideSolid(p_149660_2_ - 1, p_149660_3_, p_149660_4_, EAST)) + { + j1 = 4; + } + + return j1; + }} diff --git a/src/main/java/gmail/Lance5057/blocks/ModelCrestMount.java b/src/main/java/gmail/Lance5057/blocks/ModelCrestMount.java index 5a5759d..4b3cbd2 100644 --- a/src/main/java/gmail/Lance5057/blocks/ModelCrestMount.java +++ b/src/main/java/gmail/Lance5057/blocks/ModelCrestMount.java @@ -4,11 +4,6 @@ // Keep in mind that you still need to fill in some blanks // - ZeuX - - - - - package gmail.Lance5057.blocks; import net.minecraft.client.model.ModelBase; @@ -35,24 +30,28 @@ public class ModelCrestMount extends ModelBase ShieldMount.setTextureSize(32, 32); ShieldMount.mirror = true; setRotation(ShieldMount, 0F, 0F, 0F); + Base = new ModelRenderer(this, 0, 6); Base.addBox(0F, 0F, 0F, 4, 4, 4); Base.setRotationPoint(-2F, 20F, -2F); Base.setTextureSize(32, 32); Base.mirror = true; setRotation(Base, 0F, 0F, 0F); + SwordMount1 = new ModelRenderer(this, 0, 0); SwordMount1.addBox(-5F, 0F, -2F, 10, 2, 4); SwordMount1.setRotationPoint(0F, 22F, 0F); SwordMount1.setTextureSize(32, 32); SwordMount1.mirror = true; setRotation(SwordMount1, 0F, 0.7853982F, 0F); + SwordMount2 = new ModelRenderer(this, 0, 0); SwordMount2.addBox(-5F, 0F, -2F, 10, 2, 4); SwordMount2.setRotationPoint(0F, 22F, 0F); SwordMount2.setTextureSize(32, 32); SwordMount2.mirror = true; setRotation(SwordMount2, 0F, -0.7853982F, 0F); + SwordMount3 = new ModelRenderer(this, 0, 0); SwordMount3.addBox(-5F, 0F, -2F, 10, 2, 4); SwordMount3.setRotationPoint(0F, 21.9F, 0F); diff --git a/src/main/java/gmail/Lance5057/blocks/Renderer_CrestMount.java b/src/main/java/gmail/Lance5057/blocks/Renderer_CrestMount.java index f7a542f..57921f8 100644 --- a/src/main/java/gmail/Lance5057/blocks/Renderer_CrestMount.java +++ b/src/main/java/gmail/Lance5057/blocks/Renderer_CrestMount.java @@ -21,30 +21,29 @@ public class Renderer_CrestMount extends TileEntitySpecialRenderer { this.model = new ModelCrestMount(); } - private void adjustRotatePivotViaMeta(World world, int x, int y, int z) { - int meta = world.getBlockMetadata(x, y, z); - GL11.glPushMatrix(); - GL11.glRotatef(meta * (-90), 0.0F, 0.0F, 1.0F); - GL11.glPopMatrix(); - } - @Override public void renderTileEntityAt(TileEntity te, double x, double y, double z, float scale) { - //The PushMatrix tells the renderer to "start" doing something. GL11.glPushMatrix(); - //This is setting the initial location. + GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F); - //This is the texture of your block. It's pathed to be the same place as your other blocks here. - //Outdated bindTextureByName("/mods/roads/textures/blocks/TrafficLightPoleRed.png"); - //Use in 1.6.2 this + ResourceLocation textures = (new ResourceLocation("tinkersdefense:textures/blocks/CrestMount.png")); - //the ':' is very important - //binding the textures + Minecraft.getMinecraft().renderEngine.bindTexture(textures); - //This rotation part is very important! Without it, your model will render upside-down! And for some reason you DO need PushMatrix again! GL11.glPushMatrix(); - adjustRotatePivotViaMeta(te.getWorldObj(), te.xCoord, te.yCoord, te.zCoord);//rotation 1 + + int meta = te.getBlockMetadata(); + float rotation = 0; + switch(meta) + { + case 1: rotation = 0; break; + case 2: rotation = 180; break; + case 3: rotation = 90; break; + case 4: rotation = -90; break; + } + GL11.glRotatef(rotation, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(90F, 0.5F, 0.0F, 0.0F); GL11.glTranslatef(0, -1, -1); diff --git a/src/main/java/gmail/Lance5057/com/mod_TinkersDefense.java b/src/main/java/gmail/Lance5057/com/mod_TinkersDefense.java index 2ec7be6..929b307 100644 --- a/src/main/java/gmail/Lance5057/com/mod_TinkersDefense.java +++ b/src/main/java/gmail/Lance5057/com/mod_TinkersDefense.java @@ -1,9 +1,5 @@ package gmail.Lance5057.com; - - - - import static net.minecraft.util.EnumChatFormatting.DARK_RED; import static net.minecraft.util.EnumChatFormatting.GOLD; import static net.minecraft.util.EnumChatFormatting.LIGHT_PURPLE; @@ -43,6 +39,7 @@ import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.common.config.*; @Mod(modid="tinkersdefense", version="1.0") public class mod_TinkersDefense |