17 errors left

SlimeKnights · Feb 3, 2014 · 840e0ce · 840e0ce
1 parent 0fe91c2
commit 840e0ce
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 17 deletions.
diff --git a/resources/TConstruct_at.cfg b/resources/TConstruct_at.cfg
@@ -30,5 +30,5 @@ public net.minecraft.client.gui.GuiScreen field_146292_n #buttonList
 public net.minecraft.client.renderer.ThreadDownloadImageData field_110559_g #field_110559_g
 public net.minecraft.client.renderer.ThreadDownloadImageData field_110560_d #field_110560_d
 public net.minecraft.potion.PotionEffect field_76460_b
-
+public net.minecraft.world.gen.structure.StructureVillagePieces$Village #cant make village houses w/o this
 # needs to have a space at the end of every line or SS will derp
diff --git a/src/main/java/tconstruct/TConstruct.java b/src/main/java/tconstruct/TConstruct.java
@@ -115,7 +115,7 @@ public void preInit (FMLPreInitializationEvent event)
         GameRegistry.registerWorldGenerator(new TBaseWorldGenerator(), 0);
         MinecraftForge.TERRAIN_GEN_BUS.register(new TerrainGenEventHandler());
         GameRegistry.registerFuelHandler(content);
-        GameRegistry.registerCraftingHandler(new TCraftingHandler());
+        //GameRegistry.registerCraftingHandler(new TCraftingHandler());
         NetworkRegistry.INSTANCE.registerGuiHandler(instance, proxy);
 
         if (PHConstruct.addToVillages)
@@ -141,7 +141,7 @@ public void preInit (FMLPreInitializationEvent event)
         }
 
         playerTracker = new TPlayerHandler();
-        GameRegistry.registerPlayerTracker(playerTracker);
+        //GameRegistry.registerPlayerTracker(playerTracker);
         MinecraftForge.EVENT_BUS.register(playerTracker);
 
         PluginController.getController().preInit();

diff --git a/src/main/java/tconstruct/entity/projectile/ArrowEntity.java b/src/main/java/tconstruct/entity/projectile/ArrowEntity.java
@@ -5,6 +5,8 @@
 import java.util.List;
 import java.util.Random;
 
+import tconstruct.TConstruct;
+import tconstruct.util.network.packet.PacketPipeline;
 import net.minecraft.block.Block;
 import net.minecraft.crash.CrashReport;
 import net.minecraft.crash.CrashReportCategory;
@@ -295,7 +297,7 @@ public void onUpdate ()
                             if (this.shootingEntity != null && movingobjectposition.entityHit != this.shootingEntity && movingobjectposition.entityHit instanceof EntityPlayer
                                     && this.shootingEntity instanceof EntityPlayerMP)
                             {
-                                ((EntityPlayerMP) this.shootingEntity).playerNetServerHandler.sendPacketToPlayer(new S2BPacketChangeGameState(6, 0));
+                                TConstruct.packetPipeline.sendTo(new S2BPacketChangeGameState(6, 0), (EntityPlayerMP) this.shootingEntity);
                             }
                         }
 

diff --git a/src/main/java/tconstruct/worldgen/village/ComponentSmeltery.java b/src/main/java/tconstruct/worldgen/village/ComponentSmeltery.java
@@ -14,9 +14,9 @@
 import net.minecraft.world.gen.structure.StructureBoundingBox;
 import net.minecraft.world.gen.structure.StructureComponent;
 import net.minecraft.world.gen.structure.StructureVillagePieces;
-import net.minecraft.world.gen.structure.StructureVillagePieces.Start;
 
-public class ComponentSmeltery extends StructureComponent
+import net.minecraft.world.gen.structure.StructureVillagePieces.Start;
+public class ComponentSmeltery extends StructureVillagePieces.House1
 {
     private int averageGroundLevel = -1;
 
@@ -79,7 +79,8 @@ public boolean addComponentParts (World world, Random random, StructureBoundingB
             for (int i1 = 0; i1 < 9; ++i1)
             {
                 this.clearCurrentPositionBlocksUpwards(world, i1, 9, l, sbb);
-                this.fillCurrentPositionBlocksDownwards(world, Blocks.stonebrick, 0, i1, -1, l, sbb);
+                //TODO fillCurrentPositionBlocksDownwards 
+                this.func_151554_b(world, Blocks.stonebrick, 0, i1, -1, l, sbb);
             }
         }
 
@@ -88,7 +89,7 @@ public boolean addComponentParts (World world, Random random, StructureBoundingB
             for (int i1 = 1; i1 < 8; ++i1)
             {
                 this.clearCurrentPositionBlocksUpwards(world, i1, 9, l, sbb);
-                this.fillCurrentPositionBlocksDownwards(world, Blocks.stonebrick, 0, i1, -1, l, sbb);
+                this.func_151554_b(world, Blocks.stonebrick, 0, i1, -1, l, sbb);
             }
         }
         return true;
@@ -112,14 +113,14 @@ int remapDirection (int direction)
         return -1;
     }
 
-    protected void fillWithMetaBlocks (World par1World, StructureBoundingBox par2StructureBoundingBox, int minX, int minY, int minZ, int maxX, int maxY, int maxZ, int placeBlockID,
-            int placeBlockMeta, int replaceBlockID, int replaceBlockMeta, boolean alwaysReplace)
+    protected void fillWithMetaBlocks (World par1World, StructureBoundingBox par2StructureBoundingBox, int minX, int minY, int minZ, int maxX, int maxY, int maxZ, Block placeBlockID,
+            int placeBlockMeta, Block replaceBlockID, int replaceBlockMeta, boolean alwaysReplace)
     {
-        int i2 = this.getBiomeSpecificBlock(placeBlockID, placeBlockMeta);
-        int j2 = this.getBiomeSpecificBlockMetadata(placeBlockID, placeBlockMeta);
-        int k2 = this.getBiomeSpecificBlock(replaceBlockID, replaceBlockMeta);
-        int l2 = this.getBiomeSpecificBlockMetadata(replaceBlockID, replaceBlockMeta);
-        super.fillWithMetadataBlocks(par1World, par2StructureBoundingBox, minX, minY, minZ, maxX, maxY, maxZ, i2, j2, k2, l2, alwaysReplace);
+        Block i2 = this.func_151558_b(placeBlockID, placeBlockMeta);
+        int j2 = this.func_151557_c(placeBlockID, placeBlockMeta);
+        Block k2 = this.func_151558_b(replaceBlockID, replaceBlockMeta);
+        int l2 = this.func_151557_c(replaceBlockID, replaceBlockMeta);
+        super.func_151556_a(par1World, par2StructureBoundingBox, minX, minY, minZ, maxX, maxY, maxZ, i2, j2, k2, l2, alwaysReplace);
     }
 
     @Override

diff --git a/src/main/java/tconstruct/worldgen/village/ComponentToolWorkshop.java b/src/main/java/tconstruct/worldgen/village/ComponentToolWorkshop.java
@@ -18,7 +18,7 @@
 import net.minecraft.world.gen.structure.MapGenStructureIO;
 
 
-public class ComponentToolWorkshop extends StructureComponent
+public class ComponentToolWorkshop extends StructureVillagePieces.House1
 {
     private int averageGroundLevel = -1;
 
@@ -144,7 +144,7 @@ public boolean addComponentParts (World world, Random random, StructureBoundingB
             for (int i1 = 0; i1 < 9; ++i1)
             {
                 this.clearCurrentPositionBlocksUpwards(world, i1, 9, l, sbb);
-                this.fillCurrentPositionBlocksDownwards(world, Blocks.cobblestone, 0, i1, -1, l, sbb);
+                this.func_151554_b(world, Blocks.cobblestone, 0, i1, -1, l, sbb);
             }
         }
         this.spawnVillagers(world, sbb, 3, 1, 3, 1);