mirror of
https://github.com/GTNewHorizons/ForgeMultipart.git
synced 2026-11-20 04:09:45 +00:00
refactor: port microblock proxy to java
This commit is contained in:
1 parent
36a0e9c865
commit
f063cc94b4
10 files changed
+413
-157
No files matched your search
@@ -2,7 +2,6 @@ package codechicken.microblock
|
||||
|
||||
import net.minecraft.item.Item
|
||||
import codechicken.lib.config.ConfigTag
|
||||
import codechicken.microblock.handler.MicroblockProxy._
|
||||
import net.minecraft.item.ItemStack
|
||||
import net.minecraftforge.client.IItemRenderer
|
||||
import codechicken.lib.render.{TextureUtils, CCModel, CCRenderState}
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
package codechicken.microblock.handler;
|
||||
|
||||
public final class MicroblockProxy$ extends MicroblockProxy_clientImpl {
|
||||
|
||||
public static final MicroblockProxy$ MODULE$ = new MicroblockProxy$();
|
||||
|
||||
private MicroblockProxy$() {}
|
||||
}
|
||||
@@ -0,0 +1,98 @@
|
||||
package codechicken.microblock.handler;
|
||||
|
||||
import net.minecraft.client.renderer.RenderBlocks;
|
||||
import net.minecraft.item.Item;
|
||||
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
import codechicken.lib.config.ConfigFile;
|
||||
import codechicken.microblock.ItemMicroPart;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public final class MicroblockProxy {
|
||||
|
||||
private MicroblockProxy() {}
|
||||
|
||||
public static Logger logger() {
|
||||
return MicroblockProxy$.MODULE$.logger();
|
||||
}
|
||||
|
||||
public static void logger_$eq(Logger logger) {
|
||||
MicroblockProxy$.MODULE$.logger_$eq(logger);
|
||||
}
|
||||
|
||||
public static ItemMicroPart itemMicro() {
|
||||
return MicroblockProxy$.MODULE$.itemMicro();
|
||||
}
|
||||
|
||||
public static void itemMicro_$eq(ItemMicroPart itemMicro) {
|
||||
MicroblockProxy$.MODULE$.itemMicro_$eq(itemMicro);
|
||||
}
|
||||
|
||||
public static Item sawStone() {
|
||||
return MicroblockProxy$.MODULE$.sawStone();
|
||||
}
|
||||
|
||||
public static void sawStone_$eq(Item sawStone) {
|
||||
MicroblockProxy$.MODULE$.sawStone_$eq(sawStone);
|
||||
}
|
||||
|
||||
public static Item sawIron() {
|
||||
return MicroblockProxy$.MODULE$.sawIron();
|
||||
}
|
||||
|
||||
public static void sawIron_$eq(Item sawIron) {
|
||||
MicroblockProxy$.MODULE$.sawIron_$eq(sawIron);
|
||||
}
|
||||
|
||||
public static Item sawDiamond() {
|
||||
return MicroblockProxy$.MODULE$.sawDiamond();
|
||||
}
|
||||
|
||||
public static void sawDiamond_$eq(Item sawDiamond) {
|
||||
MicroblockProxy$.MODULE$.sawDiamond_$eq(sawDiamond);
|
||||
}
|
||||
|
||||
public static Item stoneRod() {
|
||||
return MicroblockProxy$.MODULE$.stoneRod();
|
||||
}
|
||||
|
||||
public static void stoneRod_$eq(Item stoneRod) {
|
||||
MicroblockProxy$.MODULE$.stoneRod_$eq(stoneRod);
|
||||
}
|
||||
|
||||
public static boolean useSawIcons() {
|
||||
return MicroblockProxy$.MODULE$.useSawIcons();
|
||||
}
|
||||
|
||||
public static void useSawIcons_$eq(boolean useSawIcons) {
|
||||
MicroblockProxy$.MODULE$.useSawIcons_$eq(useSawIcons);
|
||||
}
|
||||
|
||||
public static void preInit(Logger logger) {
|
||||
MicroblockProxy$.MODULE$.preInit(logger);
|
||||
}
|
||||
|
||||
public static Item createSaw(ConfigFile config, String name, int strength) {
|
||||
return MicroblockProxy$.MODULE$.createSaw(config, name, strength);
|
||||
}
|
||||
|
||||
public static void addSawRecipe(Item saw, Item blade) {
|
||||
MicroblockProxy$.MODULE$.addSawRecipe(saw, blade);
|
||||
}
|
||||
|
||||
public static RenderBlocks renderBlocks() {
|
||||
return MicroblockProxy$.MODULE$.renderBlocks();
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public static void init() {
|
||||
MicroblockProxy$.MODULE$.init();
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public static void postInit() {
|
||||
MicroblockProxy$.MODULE$.postInit();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,60 @@
|
||||
package codechicken.microblock.handler;
|
||||
|
||||
import net.minecraft.client.renderer.RenderBlocks;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraftforge.client.MinecraftForgeClient;
|
||||
|
||||
import codechicken.lib.packet.PacketCustom;
|
||||
import codechicken.microblock.AngelicaCompat;
|
||||
import codechicken.microblock.ItemMicroPartRenderer$;
|
||||
import codechicken.microblock.ItemSawRenderer$;
|
||||
import codechicken.microblock.MicroMaterialRegistry;
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import scala.collection.Iterator;
|
||||
|
||||
public class MicroblockProxy_clientImpl extends MicroblockProxy_serverImpl {
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
private RenderBlocks renderBlocks;
|
||||
|
||||
private volatile boolean bitmap$0;
|
||||
|
||||
private RenderBlocks renderBlocks$lzycompute() {
|
||||
synchronized (this) {
|
||||
if (!bitmap$0) {
|
||||
renderBlocks = new RenderBlocks();
|
||||
bitmap$0 = true;
|
||||
}
|
||||
return renderBlocks;
|
||||
}
|
||||
}
|
||||
|
||||
public RenderBlocks renderBlocks() {
|
||||
return bitmap$0 ? renderBlocks : renderBlocks$lzycompute();
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void postInit() {
|
||||
super.postInit();
|
||||
MicroMaterialRegistry.loadIcons();
|
||||
MinecraftForgeClient.registerItemRenderer(itemMicro(), ItemMicroPartRenderer$.MODULE$);
|
||||
PacketCustom.assignHandler(MicroblockCPH.registryChannel(), MicroblockCPH$.MODULE$);
|
||||
|
||||
if (Loader.isModLoaded("angelica")) {
|
||||
MicroblockMod.angelicaCompat_$eq(new AngelicaCompat());
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void init() {
|
||||
super.init();
|
||||
Iterator<Item> iterator = saws().iterator();
|
||||
while (iterator.hasNext()) {
|
||||
MinecraftForgeClient.registerItemRenderer(iterator.next(), ItemSawRenderer$.MODULE$);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,167 @@
|
||||
package codechicken.microblock.handler;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.CraftingManager;
|
||||
import net.minecraft.item.crafting.IRecipe;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
import net.minecraftforge.oredict.ShapedOreRecipe;
|
||||
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
import codechicken.lib.config.ConfigFile;
|
||||
import codechicken.lib.packet.PacketCustom;
|
||||
import codechicken.microblock.ItemMicroPart;
|
||||
import codechicken.microblock.ItemSaw;
|
||||
import codechicken.microblock.MicroMaterialRegistry;
|
||||
import codechicken.microblock.MicroRecipe$;
|
||||
import codechicken.microblock.compat.PosteaCompat;
|
||||
import codechicken.multipart.handler.MultipartProxy;
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import scala.collection.mutable.MutableList;
|
||||
|
||||
public class MicroblockProxy_serverImpl {
|
||||
|
||||
private Logger logger;
|
||||
private ItemMicroPart itemMicro;
|
||||
private Item sawStone;
|
||||
private Item sawIron;
|
||||
private Item sawDiamond;
|
||||
private Item stoneRod;
|
||||
private boolean useSawIcons;
|
||||
private MutableList<Item> saws = new MutableList<>();
|
||||
|
||||
public Logger logger() {
|
||||
return logger;
|
||||
}
|
||||
|
||||
public void logger_$eq(Logger logger) {
|
||||
this.logger = logger;
|
||||
}
|
||||
|
||||
public ItemMicroPart itemMicro() {
|
||||
return itemMicro;
|
||||
}
|
||||
|
||||
public void itemMicro_$eq(ItemMicroPart itemMicro) {
|
||||
this.itemMicro = itemMicro;
|
||||
}
|
||||
|
||||
public Item sawStone() {
|
||||
return sawStone;
|
||||
}
|
||||
|
||||
public void sawStone_$eq(Item sawStone) {
|
||||
this.sawStone = sawStone;
|
||||
}
|
||||
|
||||
public Item sawIron() {
|
||||
return sawIron;
|
||||
}
|
||||
|
||||
public void sawIron_$eq(Item sawIron) {
|
||||
this.sawIron = sawIron;
|
||||
}
|
||||
|
||||
public Item sawDiamond() {
|
||||
return sawDiamond;
|
||||
}
|
||||
|
||||
public void sawDiamond_$eq(Item sawDiamond) {
|
||||
this.sawDiamond = sawDiamond;
|
||||
}
|
||||
|
||||
public Item stoneRod() {
|
||||
return stoneRod;
|
||||
}
|
||||
|
||||
public void stoneRod_$eq(Item stoneRod) {
|
||||
this.stoneRod = stoneRod;
|
||||
}
|
||||
|
||||
public boolean useSawIcons() {
|
||||
return useSawIcons;
|
||||
}
|
||||
|
||||
public void useSawIcons_$eq(boolean useSawIcons) {
|
||||
this.useSawIcons = useSawIcons;
|
||||
}
|
||||
|
||||
public void preInit(Logger logger) {
|
||||
this.logger = logger;
|
||||
itemMicro = new ItemMicroPart();
|
||||
GameRegistry.registerItem(itemMicro, "microblock");
|
||||
sawStone = createSaw(MultipartProxy.config(), "sawStone", 1);
|
||||
sawIron = createSaw(MultipartProxy.config(), "sawIron", 2);
|
||||
sawDiamond = createSaw(MultipartProxy.config(), "sawDiamond", 3);
|
||||
stoneRod = new Item().setUnlocalizedName("microblock:stoneRod").setTextureName("microblock:stoneRod");
|
||||
GameRegistry.registerItem(stoneRod, "stoneRod");
|
||||
|
||||
OreDictionary.registerOre("rodStone", stoneRod);
|
||||
MinecraftForge.EVENT_BUS.register(MicroblockEventHandler$.MODULE$);
|
||||
|
||||
useSawIcons = MultipartProxy.config().getTag("useSawIcons")
|
||||
.setComment("Set to true to use mc style icons for the saw instead of the 3D model")
|
||||
.getBooleanValue(false);
|
||||
}
|
||||
|
||||
public MutableList<Item> saws() {
|
||||
return saws;
|
||||
}
|
||||
|
||||
public void saws_$eq(MutableList<Item> saws) {
|
||||
this.saws = saws;
|
||||
}
|
||||
|
||||
public Item createSaw(ConfigFile config, String name, int strength) {
|
||||
Item saw = new ItemSaw(config.getTag(name).useBraces(), strength).setUnlocalizedName("microblock:" + name)
|
||||
.setTextureName("microblock:" + name);
|
||||
GameRegistry.registerItem(saw, name);
|
||||
saws.$plus$eq(saw);
|
||||
return saw;
|
||||
}
|
||||
|
||||
public void addSawRecipe(Item saw, Item blade) {
|
||||
recipes().add(
|
||||
new ShapedOreRecipe(
|
||||
new ItemStack(saw),
|
||||
"srr",
|
||||
"sbr",
|
||||
Character.valueOf('s'),
|
||||
"stickWood",
|
||||
Character.valueOf('r'),
|
||||
"rodStone",
|
||||
Character.valueOf('b'),
|
||||
blade));
|
||||
}
|
||||
|
||||
public void init() {
|
||||
recipes().add(MicroRecipe$.MODULE$);
|
||||
if (!Loader.isModLoaded("dreamcraft")) {
|
||||
CraftingManager.getInstance()
|
||||
.addRecipe(new ItemStack(stoneRod, 4), "s", "s", Character.valueOf('s'), Blocks.stone);
|
||||
addSawRecipe(sawStone, Items.flint);
|
||||
addSawRecipe(sawIron, Items.iron_ingot);
|
||||
addSawRecipe(sawDiamond, Items.diamond);
|
||||
}
|
||||
}
|
||||
|
||||
public void postInit() {
|
||||
MicroMaterialRegistry.calcMaxCuttingStrength();
|
||||
PacketCustom.assignHandshakeHandler(MicroblockSPH.registryChannel(), MicroblockSPH$.MODULE$);
|
||||
if (Loader.isModLoaded("postea")) {
|
||||
PosteaCompat.registerTransformers();
|
||||
}
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private static List<IRecipe> recipes() {
|
||||
return CraftingManager.getInstance().getRecipeList();
|
||||
}
|
||||
}
|
||||
@@ -1,145 +0,0 @@
|
||||
package codechicken.microblock.handler
|
||||
|
||||
import net.minecraftforge.common.MinecraftForge
|
||||
import codechicken.multipart.handler.MultipartProxy._
|
||||
import codechicken.microblock._
|
||||
import net.minecraftforge.client.MinecraftForgeClient
|
||||
import cpw.mods.fml.relauncher.SideOnly
|
||||
import cpw.mods.fml.relauncher.Side
|
||||
import net.minecraft.item.crafting.CraftingManager
|
||||
import net.minecraft.item.Item
|
||||
import net.minecraft.item.crafting.IRecipe
|
||||
|
||||
import java.util.{List => JList}
|
||||
import codechicken.lib.config.ConfigFile
|
||||
import net.minecraftforge.oredict.OreDictionary
|
||||
import net.minecraft.item.ItemStack
|
||||
import net.minecraftforge.oredict.ShapedOreRecipe
|
||||
import codechicken.lib.packet.PacketCustom
|
||||
import codechicken.microblock.compat.PosteaCompat
|
||||
import cpw.mods.fml.common.Loader
|
||||
import cpw.mods.fml.common.registry.GameRegistry
|
||||
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 {
|
||||
var logger: Logger = _
|
||||
|
||||
var itemMicro: ItemMicroPart = _
|
||||
var sawStone: Item = _
|
||||
var sawIron: Item = _
|
||||
var sawDiamond: Item = _
|
||||
var stoneRod: Item = _
|
||||
|
||||
var useSawIcons: Boolean = _
|
||||
|
||||
def preInit(logger: Logger) {
|
||||
this.logger = logger
|
||||
itemMicro = new ItemMicroPart
|
||||
GameRegistry.registerItem(itemMicro, "microblock")
|
||||
sawStone = createSaw(config, "sawStone", 1)
|
||||
sawIron = createSaw(config, "sawIron", 2)
|
||||
sawDiamond = createSaw(config, "sawDiamond", 3)
|
||||
stoneRod = new Item()
|
||||
.setUnlocalizedName("microblock:stoneRod")
|
||||
.setTextureName("microblock:stoneRod")
|
||||
GameRegistry.registerItem(stoneRod, "stoneRod")
|
||||
|
||||
OreDictionary.registerOre("rodStone", stoneRod)
|
||||
MinecraftForge.EVENT_BUS.register(MicroblockEventHandler$.MODULE$)
|
||||
|
||||
useSawIcons = config
|
||||
.getTag("useSawIcons")
|
||||
.setComment(
|
||||
"Set to true to use mc style icons for the saw instead of the 3D model"
|
||||
)
|
||||
.getBooleanValue(false)
|
||||
}
|
||||
|
||||
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)
|
||||
.setTextureName("microblock:" + name)
|
||||
GameRegistry.registerItem(saw, name)
|
||||
saws += saw
|
||||
saw
|
||||
}
|
||||
|
||||
def addSawRecipe(saw: Item, blade: Item) {
|
||||
CraftingManager.getInstance.getRecipeList
|
||||
.asInstanceOf[JList[IRecipe]]
|
||||
.add(
|
||||
new ShapedOreRecipe(
|
||||
new ItemStack(saw),
|
||||
"srr",
|
||||
"sbr",
|
||||
's': Character,
|
||||
"stickWood",
|
||||
'r': Character,
|
||||
"rodStone",
|
||||
'b': Character,
|
||||
blade
|
||||
)
|
||||
)
|
||||
}
|
||||
|
||||
def init() {
|
||||
CraftingManager.getInstance.getRecipeList
|
||||
.asInstanceOf[JList[IRecipe]]
|
||||
.add(MicroRecipe$.MODULE$)
|
||||
if (!Loader.isModLoaded("dreamcraft")) {
|
||||
CraftingManager.getInstance.addRecipe(
|
||||
new ItemStack(stoneRod, 4),
|
||||
"s",
|
||||
"s",
|
||||
's': Character,
|
||||
Blocks.stone
|
||||
)
|
||||
addSawRecipe(sawStone, Items.flint)
|
||||
addSawRecipe(sawIron, Items.iron_ingot)
|
||||
addSawRecipe(sawDiamond, Items.diamond)
|
||||
}
|
||||
}
|
||||
|
||||
def postInit() {
|
||||
MicroMaterialRegistry.calcMaxCuttingStrength()
|
||||
PacketCustom.assignHandshakeHandler(
|
||||
MicroblockSPH.registryChannel(),
|
||||
MicroblockSPH$.MODULE$
|
||||
)
|
||||
if (Loader.isModLoaded("postea")) {
|
||||
PosteaCompat.registerTransformers()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class MicroblockProxy_clientImpl extends MicroblockProxy_serverImpl {
|
||||
@SideOnly(Side.CLIENT)
|
||||
lazy val renderBlocks = new RenderBlocks
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
override def postInit() {
|
||||
super.postInit()
|
||||
MicroMaterialRegistry.loadIcons()
|
||||
MinecraftForgeClient.registerItemRenderer(itemMicro, ItemMicroPartRenderer)
|
||||
PacketCustom.assignHandler(
|
||||
MicroblockCPH.registryChannel(),
|
||||
MicroblockCPH$.MODULE$
|
||||
)
|
||||
|
||||
if (Loader.isModLoaded("angelica"))
|
||||
MicroblockMod.angelicaCompat_$eq(new AngelicaCompat)
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
override def init() {
|
||||
super.init()
|
||||
saws.foreach(MinecraftForgeClient.registerItemRenderer(_, ItemSawRenderer))
|
||||
}
|
||||
}
|
||||
|
||||
object MicroblockProxy extends MicroblockProxy_clientImpl {}
|
||||
Reference in new issue
Block a user