From 6d55eeed2ba333b9087c64bc8f90c994ca91e95b Mon Sep 17 00:00:00 2001 From: Chicken Bones Date: Tue, 16 Jul 2013 13:08:45 +1000 Subject: [PATCH] 1.6 Commit --- {mods => assets}/microblock/models/saw.obj | 0 .../microblock/textures/items/saw.png | Bin .../microblock/textures/items/stoneRod.png | Bin codechicken/microblock/CommonMicroblock.scala | 3 +- codechicken/microblock/ItemMicroPart.scala | 3 +- codechicken/microblock/ItemSaw.scala | 8 +- .../microblock/handler/ModContainer.scala | 3 +- codechicken/microblock/handler/Proxies.scala | 3 +- codechicken/multipart/BlockMultipart.scala | 3 +- .../multipart/MultipartGenerator.scala | 1 - .../multipart/asm/ASMMixinCompiler.scala | 10 +- .../multipart/asm/ASMMixinFactory.scala | 4 +- .../multipart/asm/ScalaCompilerFactory.scala | 349 ------------------ .../multipart/handler/ModContainer.scala | 3 +- .../multipart/handler/MultipartSaveLoad.scala | 5 +- .../minecraft/MinecraftMultipartMod.java | 5 +- .../scalatraits/ITankContainer.scala | 58 ++- 17 files changed, 52 insertions(+), 406 deletions(-) rename {mods => assets}/microblock/models/saw.obj (100%) rename {mods => assets}/microblock/textures/items/saw.png (100%) rename {mods => assets}/microblock/textures/items/stoneRod.png (100%) delete mode 100644 codechicken/multipart/asm/ScalaCompilerFactory.scala diff --git a/mods/microblock/models/saw.obj b/assets/microblock/models/saw.obj similarity index 100% rename from mods/microblock/models/saw.obj rename to assets/microblock/models/saw.obj diff --git a/mods/microblock/textures/items/saw.png b/assets/microblock/textures/items/saw.png similarity index 100% rename from mods/microblock/textures/items/saw.png rename to assets/microblock/textures/items/saw.png diff --git a/mods/microblock/textures/items/stoneRod.png b/assets/microblock/textures/items/stoneRod.png similarity index 100% rename from mods/microblock/textures/items/stoneRod.png rename to assets/microblock/textures/items/stoneRod.png diff --git a/codechicken/microblock/CommonMicroblock.scala b/codechicken/microblock/CommonMicroblock.scala index c28be1d..513ed8e 100644 --- a/codechicken/microblock/CommonMicroblock.scala +++ b/codechicken/microblock/CommonMicroblock.scala @@ -30,6 +30,7 @@ import codechicken.core.render.RenderUtils import codechicken.core.render.IFaceRenderer import codechicken.multipart.TSlottedPart import scala.collection.JavaConversions._ +import codechicken.core.render.TextureUtils object CommonMicroblock { @@ -47,7 +48,7 @@ object CommonMicroblock GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA) CCRenderState.reset() - CCRenderState.changeTexture("/terrain.png") + TextureUtils.bindAtlas(0); CCRenderState.useNormals(true) CCRenderState.setBrightness(world, pos.x, pos.y, pos.z) CCRenderState.setAlpha(80) diff --git a/codechicken/microblock/ItemMicroPart.scala b/codechicken/microblock/ItemMicroPart.scala index 9d228ff..b55ee7e 100644 --- a/codechicken/microblock/ItemMicroPart.scala +++ b/codechicken/microblock/ItemMicroPart.scala @@ -22,6 +22,7 @@ import net.minecraft.world.World import codechicken.core.raytracer.RayTracer import net.minecraft.util.EnumMovingObjectType import codechicken.core.vec.Vector3 +import codechicken.core.render.TextureUtils class ItemMicroPart(id:Int) extends Item(id) { @@ -141,7 +142,7 @@ object ItemMicroPartRenderer extends IItemRenderer return CCRenderState.reset() - CCRenderState.changeTexture("/terrain.png") + TextureUtils.bindAtlas(0); CCRenderState.useNormals(true) CCRenderState.useModelColours(true) CCRenderState.pullLightmap() diff --git a/codechicken/microblock/ItemSaw.scala b/codechicken/microblock/ItemSaw.scala index 22bc684..4a059c8 100644 --- a/codechicken/microblock/ItemSaw.scala +++ b/codechicken/microblock/ItemSaw.scala @@ -19,6 +19,8 @@ import org.lwjgl.opengl.GL11 import codechicken.core.render.UVTranslation import ItemRenderType._ import codechicken.core.alg.MathHelper._ +import net.minecraft.util.ResourceLocation +import net.minecraft.client.renderer.texture.IconRegister trait Saw { @@ -44,11 +46,13 @@ class ItemSaw(sawTag:ConfigTag, val harvestLevel:Int) extends Item(sawTag.getTag override def doesContainerItemLeaveCraftingGrid(stack:ItemStack) = false def getCuttingStrength = harvestLevel + + override def registerIcons(register:IconRegister){} } object ItemSawRenderer extends IItemRenderer { - val models = CCModel.parseObjModels("/mods/microblock/models/saw.obj", 7, new SwapYZ()) + val models = CCModel.parseObjModels(new ResourceLocation("microblock", "models/saw.obj"), 7, new SwapYZ()) val handle = models.get("Handle"); val holder = models.get("BaldeSupport") val blade = models.get("Blade") @@ -70,7 +74,7 @@ object ItemSawRenderer extends IItemRenderer CCRenderState.reset() CCRenderState.useNormals(true) CCRenderState.pullLightmap() - CCRenderState.changeTexture("/mods/microblock/textures/items/saw.png") + CCRenderState.changeTexture("microblock:textures/items/saw.png") CCRenderState.setColour(0xFFFFFFFF) CCRenderState.startDrawing(7) handle.render(t, null) diff --git a/codechicken/microblock/handler/ModContainer.scala b/codechicken/microblock/handler/ModContainer.scala index bf7cf99..644d2e2 100644 --- a/codechicken/microblock/handler/ModContainer.scala +++ b/codechicken/microblock/handler/ModContainer.scala @@ -15,7 +15,8 @@ import codechicken.microblock.MicroMaterialRegistry import codechicken.microblock.DefaultContent import cpw.mods.fml.common.event.FMLPostInitializationEvent -@Mod(name="Microblocks", version="b.0.0.0", useMetadata = false, modid = "CCMicroblock", acceptedMinecraftVersions = "[1.5.2]", dependencies="required-after:CCMultipart", modLanguage="scala") +@Mod(name="Microblocks", version="b.0.0.0", useMetadata = false, modid = "ForgeMicroblock", acceptedMinecraftVersions = "[1.6.2]", + dependencies="required-after:ForgeMultipart", modLanguage="scala") object MicroblockMod { @PreInit diff --git a/codechicken/microblock/handler/Proxies.scala b/codechicken/microblock/handler/Proxies.scala index 0f0f2e3..f6e76e0 100644 --- a/codechicken/microblock/handler/Proxies.scala +++ b/codechicken/microblock/handler/Proxies.scala @@ -45,7 +45,8 @@ class MicroblockProxy_serverImpl sawStone = createSaw(config, "sawStone", 1, "Stone Handsaw") sawIron = createSaw(config, "sawIron", 2, "Iron Handsaw") sawDiamond = createSaw(config, "sawDiamond", 3, "Diamond Handsaw") - stoneRod = new Item(config.getTag("stoneRod.id").getIntValue(nextItemID)).setUnlocalizedName("microblock:stoneRod") + stoneRod = new Item(config.getTag("stoneRod.id").getIntValue(nextItemID)) + .setUnlocalizedName("microblock:stoneRod").func_111206_d("microblock:stoneRod") LanguageRegistry.addName(stoneRod, "Stone Rod") OreDictionary.registerOre("stoneRod", stoneRod) diff --git a/codechicken/multipart/BlockMultipart.scala b/codechicken/multipart/BlockMultipart.scala index f872623..6ac535e 100644 --- a/codechicken/multipart/BlockMultipart.scala +++ b/codechicken/multipart/BlockMultipart.scala @@ -185,9 +185,8 @@ trait BlockMultipart extends Block { val n = getUnlocalizedName(); val icon = TextureUtils.getBlankIcon(16, register); - setUnlocalizedName(icon.getIconName) + setTextureName(icon.getIconName) super.registerIcons(register) - setUnlocalizedName(n) } override def getLightValue(world:IBlockAccess, x:Int, y:Int, z:Int):Int = diff --git a/codechicken/multipart/MultipartGenerator.scala b/codechicken/multipart/MultipartGenerator.scala index 78ea051..0d15e43 100644 --- a/codechicken/multipart/MultipartGenerator.scala +++ b/codechicken/multipart/MultipartGenerator.scala @@ -12,7 +12,6 @@ import net.minecraft.network.packet.Packet53BlockChange import scala.collection.mutable.ListBuffer import scala.collection.mutable.ListBuffer import codechicken.multipart.asm.IMultipartFactory -import codechicken.multipart.asm.ScalaCompilerFactory import codechicken.multipart.asm.ASMMixinFactory object MultipartGenerator diff --git a/codechicken/multipart/asm/ASMMixinCompiler.scala b/codechicken/multipart/asm/ASMMixinCompiler.scala index 69afe55..080169d 100644 --- a/codechicken/multipart/asm/ASMMixinCompiler.scala +++ b/codechicken/multipart/asm/ASMMixinCompiler.scala @@ -3,7 +3,6 @@ package codechicken.multipart.asm import scala.collection.mutable.{Map => MMap, ListBuffer => MList, Set => MSet} import scala.collection.JavaConversions._ import scala.collection.JavaConverters._ -import cpw.mods.fml.relauncher.RelaunchClassLoader import org.objectweb.asm.tree._ import org.objectweb.asm.Opcodes._ import org.objectweb.asm.ClassReader @@ -13,17 +12,18 @@ import org.objectweb.asm.Type import org.objectweb.asm.MethodVisitor import Type._ import codechicken.core.asm.ASMHelper._ -import codechicken.core.asm.ObfuscationMappings._ +import codechicken.core.asm.ObfMapping import java.io.File import java.io.PrintWriter import ScalaSignature._ import java.lang.reflect.Method import java.lang.reflect.Modifier +import net.minecraft.launchwrapper.LaunchClassLoader import codechicken.multipart.handler.MultipartProxy object DebugPrinter { - def debug = MultipartProxy.config.getTag("debug_asm").getBooleanValue(!obfuscated) + def debug = MultipartProxy.config.getTag("debug_asm").getBooleanValue(!ObfMapping.obfuscated) private var permGenUsed = 0 val dir = new File("asm/multipart") @@ -59,7 +59,7 @@ object DebugPrinter object ASMMixinCompiler { - val cl = getClass.getClassLoader.asInstanceOf[RelaunchClassLoader] + val cl = getClass.getClassLoader.asInstanceOf[LaunchClassLoader] val m_defineClass = classOf[ClassLoader].getDeclaredMethod("defineClass", classOf[Array[Byte]], Integer.TYPE, Integer.TYPE) m_defineClass.setAccessible(true) @@ -558,7 +558,7 @@ object ASMMixinCompiler } else if(!sym.name.equals("$init$") && !sym.isPrivate) { - methods+=findMethod(new DescriptorMapping(cnode.name, sym.name, desc), cnode) + methods+=findMethod(new ObfMapping(cnode.name, sym.name, desc), cnode) } } else diff --git a/codechicken/multipart/asm/ASMMixinFactory.scala b/codechicken/multipart/asm/ASMMixinFactory.scala index 25740b7..1e608ee 100644 --- a/codechicken/multipart/asm/ASMMixinFactory.scala +++ b/codechicken/multipart/asm/ASMMixinFactory.scala @@ -20,7 +20,7 @@ import org.objectweb.asm.Type import Type._ import scala.collection.immutable.Range import codechicken.core.asm.ASMHelper._ -import codechicken.core.asm.ObfuscationMappings._ +import codechicken.core.asm.ObfMapping import codechicken.multipart.MultipartGenerator import ASMMixinCompiler._ @@ -129,7 +129,7 @@ object ASMMixinFactory extends IMultipartFactory private def autoCompleteJavaTrait(cnode:ClassNode) { - if(!cnode.fields.isEmpty && findMethod(new DescriptorMapping(cnode.name, "copyFrom", "(Lcodechicken/multipart/TileMultipart;)V"), cnode) == null) + if(!cnode.fields.isEmpty && findMethod(new ObfMapping(cnode.name, "copyFrom", "(Lcodechicken/multipart/TileMultipart;)V"), cnode) == null) { val mv = cnode.visitMethod(ACC_PUBLIC, "copyFrom", "(Lcodechicken/multipart/TileMultipart;)V", null, null) mv.visitVarInsn(ALOAD, 0) diff --git a/codechicken/multipart/asm/ScalaCompilerFactory.scala b/codechicken/multipart/asm/ScalaCompilerFactory.scala deleted file mode 100644 index 7f9d45c..0000000 --- a/codechicken/multipart/asm/ScalaCompilerFactory.scala +++ /dev/null @@ -1,349 +0,0 @@ -package codechicken.multipart.asm - -import scala.reflect.runtime.{universe => ru} -import ru._ -import Flag._ -import scala.tools.reflect.ToolBox -import scala.collection.mutable.{Map => MMap} -import codechicken.multipart.TileMultipart -import codechicken.multipart.TileMultipartClient -import codechicken.multipart.handler.MultipartProxy -import cpw.mods.fml.common.FMLCommonHandler -import codechicken.multipart.TMultiPart -import cpw.mods.fml.relauncher.Side -import codechicken.multipart.MultipartGenerator - -/** - * Adds top level code gen to toolboxes - * Scala 2.10 implementaton for https://github.com/scala/scala/pull/2662 - */ -class ExtendedToolbox(tb:ToolBox[ru.type]) -{ - def define(tree: ImplDef, pkg:String): Symbol = - { - val compiler = tb.asInstanceOf[{ def compiler: scala.tools.nsc.Global }].compiler - val importer = compiler.mkImporter(ru) - val exporter = importer.reverse - val ctree: compiler.ImplDef = importer.importTree(tree).asInstanceOf[compiler.ImplDef] - def defineInternal(ctree: compiler.ImplDef): compiler.Symbol = - { - import compiler._ - - val pdef = PackageDef(Ident(pkg:TermName), List(ctree)) - val unit = new CompilationUnit(scala.reflect.internal.util.NoSourceFile) - unit.body = pdef - - val run = new Run - reporter.reset() - run.compileUnits(List(unit), run.namerPhase) - compiler.asInstanceOf[{ def throwIfErrors(): Unit }].throwIfErrors() - - ctree.symbol - } - val csym: compiler.Symbol = defineInternal(ctree) - val usym = exporter.importSymbol(csym) - usym - } -} - -object ExtendedToolbox -{ - implicit def extend(tb:ToolBox[ru.type]) = new ExtendedToolbox(tb) -} - -object ScalaCompilerFactory extends IMultipartFactory -{ - import ExtendedToolbox._ - - private var ugenid = 0 - - val mirror = scala.reflect.runtime.currentMirror - val tb = mirror.mkToolBox() - private val definedTypes = MMap[String, TypeSymbol]() - - def getType(obj:Any) = mirror.classSymbol(obj.getClass).toType - - def Apply(f:Tree, args:Tree*) = scala.reflect.runtime.universe.Apply(f, List(args:_*)) - def Apply(f:Tree, args:List[Tree]) = scala.reflect.runtime.universe.Apply(f, args) - def TypeApply(f:Tree, args:Tree*) = scala.reflect.runtime.universe.TypeApply(f, List(args:_*)) - def TypeApply(f:Tree, args:List[Tree]) = scala.reflect.runtime.universe.TypeApply(f, args) - def Invoke(s:Tree, n:TermName, args:Tree*) = Apply(Select(s, n), args:_*) - def literalUnit = Literal(Constant(())) - def const(o:Any) = Literal(Constant(o)) - def PkgIdent(s:String):Tree = Ident(typeSymbol(s)) - - def typeSymbol(s:String) = definedTypes.getOrElse(s, mirror.staticClass(s)) - - def defaultConstructor() = - DefDef( - Modifiers(), - nme.CONSTRUCTOR, //method name - List(), //type params - List(List()), //params - TypeTree(), //return type - Block( - Invoke(//body - Super(This(tpnme.EMPTY), tpnme.EMPTY), - nme.CONSTRUCTOR - ) - ) - ) - - def normalClassDef(mods:FlagSet, name:String, parents:List[TypeSymbol], methods:List[Tree]) = - ClassDef( - Modifiers(mods), - name, - List(), - Template( - parents.map(Ident(_)), - emptyValDef, - methods - ) - ) - - def uniqueName(prefix:String):String = { - val ret = prefix+"$$"+ugenid - ugenid += 1 - return ret - } - - def define(tree: ImplDef): TypeSymbol = - { - val sym = tb.define(tree, "scfactory").asType - definedTypes+=((sym.fullName, sym)) - return sym - } - - abstract class Constructor - { - def generate():TileMultipart - } - - object SuperSet - { - val TileMultipartType = classOf[TileMultipart].getName - val TileMultipartClientType = classOf[TileMultipartClient].getName - def apply(types:Seq[String], client:Boolean) = new SuperSet(types, client) - } - - class SuperSet(types:Seq[String], client:Boolean) - { - import SuperSet._ - val set = baseType+:types.sorted - - def interfaces = set - def baseType = if(client) TileMultipartClientType else TileMultipartType - - override def equals(obj:Any) = obj match - { - case x:SuperSet => set == x.set - case _ => false - } - - override def hashCode() = set.hashCode - - def generate():TileMultipart = - { - return generatorMap.getOrElse(this, gen_sync).generate - } - - def gen_sync():Constructor = tb.synchronized - { - return generatorMap.getOrElse(this, { - var gen = generator - generatorMap = generatorMap+(this->gen) - gen - }) - } - - def generator():Constructor = - { - val startTime = System.currentTimeMillis - val defClass = - normalClassDef( - NoFlags, - uniqueName("TileMultipart_cmp"), - set.map(s => typeSymbol(s)).toList, - List( - defaultConstructor - ) - ) - val csym = define(defClass) - - val defClassOf = TypeApply(Ident("classOf"), Ident(csym)) - val cmpClass = tb.eval(defClassOf).asInstanceOf[Class[_ <: TileMultipart]] - MultipartGenerator.registerTileClass(cmpClass, types.toSet) - - val defGenClass = - normalClassDef( - FINAL, - uniqueName("TileMultipart_gen"), - List(typeOf[Constructor].typeSymbol.asType), - List(//methods - defaultConstructor, - DefDef( - Modifiers(OVERRIDE), - "generate":TermName, - List(), - List(List()), - TypeTree(), - Invoke( - New(Ident(csym)), - nme.CONSTRUCTOR - ) - ) - ) - ) - val gsym = define(defGenClass) - - val constructGenClass = - Invoke(//return new generator instance - New(Ident(gsym)), - nme.CONSTRUCTOR - ) - - val genInst = tb.eval(Block(defGenClass, constructGenClass)).asInstanceOf[Constructor] - println("Generation ["+types.mkString(", ")+"] took: "+(System.currentTimeMillis-startTime)) - return genInst - } - } - - private var generatorMap:Map[SuperSet, Constructor] = Map() - - SuperSet(Seq(), false).generate//default impl, boots generator - if(FMLCommonHandler.instance.getEffectiveSide == Side.CLIENT) - SuperSet(Seq(), true).generate - - def registerTrait(s_interface:String, s_trait:String, client:Boolean){} - - def generatePassThroughTrait(s_interface:String):String = - { - def passThroughTraitName(iName:String) = - "T" + (if(iName.startsWith("I")) iName.substring(1) else iName) - - val iSymbol = mirror.staticClass(s_interface) - val tname = uniqueName(passThroughTraitName(iSymbol.name.decoded)) - val vname = tname+"_impl" - - def symbolToValDef(m:Symbol) = - ValDef(Modifiers(PARAM), m.asTerm.name.decoded, Ident(m), EmptyTree) - - def passThroughMethod(tname:String, vname:String, m:MethodSymbol):Tree = - DefDef( - Modifiers(Flag.OVERRIDE), - m.name, - List(), - m.paramss.map(_.map(m => symbolToValDef(m))), - TypeTree(), - Apply( - Select( - Select(This(tname), vname), - m.name.toTermName), - m.paramss.flatMap(_.map{m => - Ident(m.name) - }) - ) - ) - - val methods = iSymbol.toType.members.filter(_.isJava).map(m => passThroughMethod(tname, vname, m.asMethod)) - val traitDef = - normalClassDef( - ABSTRACT | TRAIT, - tname, - List( - typeSymbol("codechicken.multipart.TileMultipart"), - iSymbol), - List( - ValDef(//pass through field - Modifiers(MUTABLE | DEFAULTINIT), - vname, - Ident(iSymbol), - EmptyTree), - DefDef( - Modifiers(OVERRIDE), - "bindPart":TermName, - List(), - List( - List( - ValDef(Modifiers(PARAM), "part", PkgIdent("codechicken.multipart.TMultiPart"), EmptyTree) - )), - TypeTree(), - Block( - If( - TypeApply( - Select(Ident("part"), "isInstanceOf"), - Ident(iSymbol)), - Apply( - Select(This(tname), vname+"_$eq"), - TypeApply( - Select(Ident("part"), "asInstanceOf"), - Ident(iSymbol))), - literalUnit), - Apply( - Select(Super(This(tpnme.EMPTY), tpnme.EMPTY), "bindPart"), - Ident("part") - ) - )), - DefDef( - Modifiers(OVERRIDE), - "partRemoved":TermName, - List(), - List( - List( - ValDef(Modifiers(PARAM), "part", PkgIdent("codechicken.multipart.TMultiPart"), EmptyTree), - ValDef(Modifiers(PARAM), "p", PkgIdent("scala.Int"), EmptyTree) - )), - TypeTree(), - Block( - If( - Apply( - Select(Ident("part"), "$eq$eq"), - Select(This(tname), vname)), - Apply( - Select(This(tname), vname+"_$eq"), - const(null)), - literalUnit), - Apply( - Select(Super(This(tpnme.EMPTY), tpnme.EMPTY), "partRemoved"), - Ident("part"), - Ident("p") - ) - )), - DefDef( - Modifiers(OVERRIDE), - "canAddPart":TermName, - List(), - List( - List( - ValDef(Modifiers(PARAM), "part", PkgIdent("codechicken.multipart.TMultiPart"), EmptyTree) - )), - Ident("Boolean":TypeName), - Block( - If(//if(part.isInstanceOf[I] && impl != null) - Invoke( - TypeApply( - Select(Ident("part"), "isInstanceOf"), - Ident(iSymbol)), - "$amp$amp", - Invoke( - Select(This(tname), vname), - "$bang$eq", - const(null))), - Return(const(false)),//return true - literalUnit),//else nothing - Invoke(//call super - Super(This(tpnme.EMPTY), tpnme.EMPTY), - "canAddPart", - Ident("part") - ) - ) - ) - ) - ++methods - ) - - return define(traitDef).fullName - } - - def generateTile(types:Seq[String], client:Boolean) = SuperSet(types, client).generate -} \ No newline at end of file diff --git a/codechicken/multipart/handler/ModContainer.scala b/codechicken/multipart/handler/ModContainer.scala index 920a557..648f7da 100644 --- a/codechicken/multipart/handler/ModContainer.scala +++ b/codechicken/multipart/handler/ModContainer.scala @@ -12,7 +12,8 @@ import codechicken.multipart.MultiPartRegistry import cpw.mods.fml.relauncher.SideOnly import codechicken.core.packet.PacketCustom.CustomTinyPacketHandler -@Mod(name="Multipart API", version="b.0.0.0", useMetadata = false, modid = "CCMultipart", acceptedMinecraftVersions = "[1.5.2]", modLanguage="scala") +@Mod(name="Multipart API", version="b.0.0.0", useMetadata = false, modid = "ForgeMultipart", acceptedMinecraftVersions = "[1.6.2]", + modLanguage="scala") @NetworkMod(clientSideRequired = true, serverSideRequired = true, tinyPacketHandler=classOf[CustomTinyPacketHandler]) object MultipartMod { diff --git a/codechicken/multipart/handler/MultipartSaveLoad.scala b/codechicken/multipart/handler/MultipartSaveLoad.scala index 88de822..9a43b46 100644 --- a/codechicken/multipart/handler/MultipartSaveLoad.scala +++ b/codechicken/multipart/handler/MultipartSaveLoad.scala @@ -6,8 +6,7 @@ import java.util.Map import net.minecraft.world.chunk.Chunk import net.minecraft.world.ChunkPosition import codechicken.multipart.TileMultipart -import codechicken.core.asm.ObfuscationMappings - +import codechicken.core.asm.ObfMapping /** * Hack due to lack of TileEntityLoadEvent in forge @@ -29,7 +28,7 @@ object MultipartSaveLoad def hookLoader() { //hacky stuff for mcpc until I get a proper obfuscator on the build - val fieldName = if(ObfuscationMappings.obfuscated) "field_70326_a" else "nameToClassMap" + val fieldName = if(ObfMapping.obfuscated) "a" else "nameToClassMap" val field = classOf[TileEntity].getDeclaredField(fieldName) field.setAccessible(true) diff --git a/codechicken/multipart/minecraft/MinecraftMultipartMod.java b/codechicken/multipart/minecraft/MinecraftMultipartMod.java index de1be51..0daec70 100644 --- a/codechicken/multipart/minecraft/MinecraftMultipartMod.java +++ b/codechicken/multipart/minecraft/MinecraftMultipartMod.java @@ -6,19 +6,18 @@ import codechicken.core.packet.PacketCustom.CustomTinyPacketHandler; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.Instance; -import cpw.mods.fml.common.Mod.PreInit; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.NetworkMod; import cpw.mods.fml.relauncher.Side; -@Mod(name="Minecraft Multipart", version="1.0.0.0", useMetadata = false, modid = "McMultipart", acceptedMinecraftVersions="[1.5.2]") +@Mod(name="Minecraft Multipart", version="1.0.0.0", useMetadata = false, modid = "McMultipart", acceptedMinecraftVersions="[1.6.2]") @NetworkMod(clientSideRequired = true, serverSideRequired = true, tinyPacketHandler=CustomTinyPacketHandler.class) public class MinecraftMultipartMod { @Instance("McMultipart") public static MinecraftMultipartMod instance; - @PreInit + @Mod.EventHandler public void preInit(FMLPreInitializationEvent event) { new Content().init(); diff --git a/codechicken/multipart/scalatraits/ITankContainer.scala b/codechicken/multipart/scalatraits/ITankContainer.scala index ae76076..3fccedb 100644 --- a/codechicken/multipart/scalatraits/ITankContainer.scala +++ b/codechicken/multipart/scalatraits/ITankContainer.scala @@ -1,16 +1,18 @@ package codechicken.multipart.scalatraits -import net.minecraftforge.liquids.ITankContainer import scala.collection.mutable.ListBuffer -import net.minecraftforge.liquids.LiquidStack -import net.minecraftforge.liquids.ILiquidTank import net.minecraftforge.common.ForgeDirection import codechicken.multipart.TMultiPart import codechicken.multipart.TileMultipart +import net.minecraftforge.fluids.IFluidHandler +import net.minecraftforge.fluids.FluidStack +import net.minecraftforge.fluids.IFluidTank +import net.minecraftforge.fluids.FluidTankInfo +import net.minecraftforge.fluids.Fluid -trait TTankContainerTile extends TileMultipart with ITankContainer +trait TTankContainerTile extends TileMultipart with IFluidHandler { - var tankList = ListBuffer[ITankContainer]() + var tankList = ListBuffer[IFluidHandler]() override def copyFrom(that:TileMultipart) { @@ -22,15 +24,15 @@ trait TTankContainerTile extends TileMultipart with ITankContainer override def partAdded(part:TMultiPart) { super.partAdded(part) - if(part.isInstanceOf[ITankContainer]) - tankList+=part.asInstanceOf[ITankContainer] + if(part.isInstanceOf[IFluidHandler]) + tankList+=part.asInstanceOf[IFluidHandler] } override def partRemoved(part:TMultiPart, p:Int) { super.partRemoved(part, p) - if(part.isInstanceOf[ITankContainer]) - tankList-=part.asInstanceOf[ITankContainer] + if(part.isInstanceOf[IFluidHandler]) + tankList-=part.asInstanceOf[IFluidHandler] } override def clearParts() @@ -39,30 +41,20 @@ trait TTankContainerTile extends TileMultipart with ITankContainer tankList.clear } - override def getTanks(dir:ForgeDirection):Array[ILiquidTank] = + override def getTankInfo(dir:ForgeDirection):Array[FluidTankInfo] = { var tankCount:Int = 0 - tankList.foreach(t => tankCount += t.getTanks(dir).length) - val tanks = new Array[ILiquidTank](tankCount) + tankList.foreach(t => tankCount += t.getTankInfo(dir).length) + val tanks = new Array[FluidTankInfo](tankCount) var i = 0 - tankList.foreach(p => p.getTanks(dir).foreach{t => + tankList.foreach(p => p.getTankInfo(dir).foreach{t => tanks(i) = t i+=1 }) return tanks } - override def getTank(dir:ForgeDirection, liquid:LiquidStack):ILiquidTank = - { - tankList.foreach{p => - val t = p.getTank(dir, liquid) - if(t != null) - return t//TODO: bad, slow - } - return null - } - - override def fill(dir:ForgeDirection, liquid:LiquidStack, doFill:Boolean):Int = + override def fill(dir:ForgeDirection, liquid:FluidStack, doFill:Boolean):Int = { var filled = 0 var initial = liquid.amount @@ -72,19 +64,23 @@ trait TTankContainerTile extends TileMultipart with ITankContainer return filled } - def copy(liquid:LiquidStack, quantity:Int):LiquidStack = + override def canFill(dir:ForgeDirection, liquid:Fluid) = tankList.find(_.canFill(dir, liquid)).isDefined + + override def canDrain(dir:ForgeDirection, liquid:Fluid) = tankList.find(_.canDrain(dir, liquid)).isDefined + + def copy(liquid:FluidStack, quantity:Int):FluidStack = { val copy = liquid.copy copy.amount = quantity return copy } - override def drain(dir:ForgeDirection, amount:Int, doDrain:Boolean):LiquidStack = + override def drain(dir:ForgeDirection, amount:Int, doDrain:Boolean):FluidStack = { - var drained:LiquidStack = null + var drained:FluidStack = null tankList.foreach{p => val ret = p.drain(dir, amount-drained.amount, false) - if(ret != null && ret.amount > 0 && (drained == null || drained.isLiquidEqual(ret))) + if(ret != null && ret.amount > 0 && (drained == null || drained.isFluidEqual(ret))) { if(doDrain) p.drain(dir, amount-drained.amount, true) @@ -97,10 +93,4 @@ trait TTankContainerTile extends TileMultipart with ITankContainer } return drained } - - override def fill(tankIndex:Int, liquid:LiquidStack, doFill:Boolean):Int = - throw new UnsupportedOperationException("Index based tank filling") - - override def drain(tankIndex:Int, maxDrain:Int, doDrain:Boolean):LiquidStack = - throw new UnsupportedOperationException("Index based tank draining") } \ No newline at end of file