mirror of
https://github.com/GTNewHorizons/ForgeMultipart.git
synced 2026-11-21 04:32:24 +00:00
Fix crash with forge build 1067 and above
Update CCL Fix typo
This commit is contained in:
1 parent
781a26aed9
commit
cc0bc9827a
3 files changed
+7
-8
No files matched your search
@@ -1,4 +1,4 @@
|
||||
mc_version=1.7.2
|
||||
forge_version=10.12.0.1054
|
||||
ccl_version=1.1.1.78
|
||||
ccl_version=1.1.1.80
|
||||
mod_version=1.1.0
|
||||
@@ -14,13 +14,12 @@ import codechicken.lib.config.ConfigFile
|
||||
import net.minecraftforge.oredict.OreDictionary
|
||||
import net.minecraft.item.ItemStack
|
||||
import net.minecraftforge.oredict.ShapedOreRecipe
|
||||
import net.minecraft.block.Block
|
||||
import codechicken.lib.packet.PacketCustom
|
||||
import cpw.mods.fml.common.registry.GameRegistry
|
||||
import cpw.mods.fml.common.network.NetworkRegistry
|
||||
import net.minecraft.client.renderer.RenderBlocks
|
||||
import net.minecraft.init.{Blocks, Items}
|
||||
import org.apache.logging.log4j.Logger
|
||||
import scala.collection.mutable
|
||||
|
||||
class MicroblockProxy_serverImpl
|
||||
{
|
||||
@@ -52,9 +51,11 @@ class MicroblockProxy_serverImpl
|
||||
MinecraftForge.EVENT_BUS.register(MicroblockEventHandler)
|
||||
}
|
||||
|
||||
protected var saws = mutable.MutableList[Item]()
|
||||
def createSaw(config: ConfigFile, name: String, strength: Int) = {
|
||||
val saw = new ItemSaw(config.getTag(name).useBraces(), strength).setUnlocalizedName("microblock:" + name)
|
||||
GameRegistry.registerItem(saw, name)
|
||||
saws+=saw
|
||||
saw
|
||||
}
|
||||
|
||||
@@ -96,10 +97,8 @@ class MicroblockProxy_clientImpl extends MicroblockProxy_serverImpl
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
override def createSaw(config: ConfigFile, name: String, strength: Int) = {
|
||||
val saw = super.createSaw(config, name, strength)
|
||||
MinecraftForgeClient.registerItemRenderer(saw, ItemSawRenderer)
|
||||
saw
|
||||
override def init() {
|
||||
saws.foreach(MinecraftForgeClient.registerItemRenderer(_, ItemSawRenderer))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ package codechicken.multipart
|
||||
trait TFacePart extends TSlottedPart
|
||||
{
|
||||
/**
|
||||
* Passed down from Block.isBlockSolidOnSide. Return true if this part is solid and opaque on the specified side
|
||||
* Passed down from Block.isSideSolid. Return true if this part is solid and opaque on the specified side
|
||||
*/
|
||||
def solid(side:Int):Boolean = true
|
||||
/**
|
||||
|
||||
Reference in new issue
Block a user