CubicChunks post api version update

Author: Foghrye4

CubicChunks

@@ -23,7 +23,7 @@ apply plugin: "java"
 //Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
 
 
-version = v
+version = "0.3.0"
 group = "labyrinth" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "labyrinth"
 
@@ -33,7 +33,7 @@ compileJava {
 }
 
 minecraft {
-    version = "1.12.2-14.23.0.2487"
+    version = "1.12.2-14.23.4.2705"
     runDir = "run"
     mappings = "snapshot_20170822"
 }
@@ -44,12 +44,18 @@ repositories {
         name = 'spongepowered-repo'
         url = 'http://repo.spongepowered.org/maven/'
     }
+    maven {
+        name = 'sonatype'
+        url = 'https://oss.sonatype.org/content/repositories/public/'
+    }
 }
 
 dependencies {
-	compile "org.spongepowered:mixin:0.6.8-SNAPSHOT"
-//	compile files('lib/CubicChunks-1.12.2-0.0.757.0-dev.jar')
-	compile project(':CubicChunks')
+//	compile "io.github.opencubicchunks:regionlib:0.44.0-SNAPSHOT"
+    deobfCompile "io.github.opencubicchunks:cubicchunks-api:1.12.2-0.0-SNAPSHOT"
+//    compile "org.spongepowered:mixin:0.7.10-SNAPSHOT"
+//	compile files('lib/CubicChunks-1.12.2-0.0.824.0-SNAPSHOT-dev.jar')
+//	compile project(':CubicChunks')
 }
 
 processResources {

build.gradle

@@ -1,6 +1,7 @@
-include 'CubicChunks'
+//include 'CubicChunks'
 
-include 'RegionLib'
-project(':RegionLib').projectDir = new File('CubicChunks/RegionLib')
+//include 'RegionLib'
+//project(':RegionLib').projectDir = new File('CubicChunks/RegionLib')
+
+//rootProject.children.each { it.buildFileName = 'build.gradle.kts' }
 
-rootProject.children.each { it.buildFileName = 'build.gradle.kts' }

settings.gradle

@@ -6,7 +6,6 @@
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
-import labyrinth.entity.EntityEraserFrame;
 import labyrinth.gui.GuiVillageMarket;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityPlayerSP;
@@ -33,28 +32,13 @@ public void onPacketFromServerToClient(FMLNetworkEvent.ClientCustomPacketEvent e
 		EntityPlayerSP player = mc.player;
 		switch (ClientCommands.values()[byteBufInputStream.readByte()]) {
 			case SHOW_ERASER_FRAME:
-				for (Entity entity : world.loadedEntityList) {
-					if (entity instanceof EntityEraserFrame)
-						entity.setDead();
-				}
 				BlockPos from = byteBufInputStream.readBlockPos();
 				BlockPos to = byteBufInputStream.readBlockPos();
-				Entity entity = new EntityEraserFrame(world);
-				entity.setPosition(to.getX(), to.getY(), to.getZ());
-				int x1 = from.getX();
-				int y1 = from.getY();
-				int z1 = from.getZ();
-				int x2 = to.getX();
-				int y2 = to.getY();
-				int z2 = to.getZ();
-				x1+=x1>x2?1:0;
-				y1+=y1>y2?1:0;
-				z1+=z1>z2?1:0;
-				x2+=x2>x1?1:0;
-				y2+=y2>y1?1:0;
-				z2+=z2>z1?1:0;
-				entity.setEntityBoundingBox(new AxisAlignedBB(x1,y1,z1,x2,y2,z2));
-				world.spawnEntity(entity);
+				ClientProxy.drawBlockHighlightHandler.setNewPos(from, to);
+				ClientProxy.drawBlockHighlightHandler.drawEraserFrame=true;
+				break;
+			case HIDE_ERASER_FRAME:
+				ClientProxy.drawBlockHighlightHandler.drawEraserFrame=false;
 				break;
 			case OPEN_GUI_VILLAGE_MARKET:
 				int windowId = byteBufInputStream.readInt();

src/main/java/labyrinth/ClientNetworkHandler.java

@@ -5,12 +5,13 @@
 import java.io.InputStream;
 
 import labyrinth.block.BlockStoneTile;
+import labyrinth.client.ClientEventHandler;
+import labyrinth.client.Icon;
 import labyrinth.client.model.ModelMiniSpider;
-import labyrinth.client.renderer.RenderEntityEraserFrame;
+import labyrinth.client.renderer.DrawBlockHighlightEventHandler;
 import labyrinth.client.renderer.RenderMiniSpider;
 import labyrinth.client.renderer.SpecialRendererRegistry;
 import labyrinth.client.renderer.TileEntityVillageMarketRenderer;
-import labyrinth.entity.EntityEraserFrame;
 import labyrinth.entity.EntityMiniSpiderLeveled;
 import labyrinth.init.LabyrinthBlocks;
 import labyrinth.init.LabyrinthItems;
@@ -20,6 +21,7 @@
 import net.minecraft.item.Item;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.event.ModelBakeEvent;
+import net.minecraftforge.client.event.TextureStitchEvent;
 import net.minecraftforge.client.model.ModelLoader;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.client.registry.ClientRegistry;
@@ -30,6 +32,9 @@ public class ClientProxy extends ServerProxy {
 	private final ClientNetworkHandler networkHandler = new ClientNetworkHandler();
 	private final TileEntityVillageMarketRenderer vmr = new TileEntityVillageMarketRenderer();
 	private final ModelMiniSpider miniSpider = new ModelMiniSpider();
+	private static final ResourceLocation SPIDER_TEXTURE = new ResourceLocation(LabyrinthMod.MODID, "entity/spider");
+	private static final Icon SPIDER_ICON = SpecialRendererRegistry.registerIcon(SPIDER_TEXTURE);
+	public static final DrawBlockHighlightEventHandler drawBlockHighlightHandler = new DrawBlockHighlightEventHandler();
 
 	@Override
 	public void registerRenders() {
@@ -38,15 +43,14 @@ public void registerRenders() {
 		for(BlockStoneTile.EnumType type:BlockStoneTile.EnumType.values()){
 			ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(LabyrinthBlocks.STONE), type.getMetadata(), new ModelResourceLocation(new ResourceLocation(LabyrinthMod.MODID,type.getName()), "inventory"));
 		}
-		Minecraft.getMinecraft().getRenderManager().entityRenderMap.put(EntityEraserFrame.class, new RenderEntityEraserFrame(Minecraft.getMinecraft().getRenderManager()));
-		Minecraft.getMinecraft().getRenderManager().entityRenderMap.put(EntityMiniSpiderLeveled.class, new RenderMiniSpider<EntityMiniSpiderLeveled>(Minecraft.getMinecraft().getRenderManager(), miniSpider));
+		Minecraft.getMinecraft().getRenderManager().entityRenderMap.put(EntityMiniSpiderLeveled.class, new RenderMiniSpider(Minecraft.getMinecraft().getRenderManager(), miniSpider));
 		vmr.setRenders();
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityVillageMarket.class, vmr);
 	}
-	
+
 	@SubscribeEvent
 	public void onModelBake(ModelBakeEvent event) {
-		miniSpider.bake();
+		miniSpider.bake(SPIDER_ICON);
 	}
 
 	@Override
@@ -59,6 +63,8 @@ public void preInit() {
 		MinecraftForge.EVENT_BUS.register(SpecialRendererRegistry.instance);
 		MinecraftForge.EVENT_BUS.register(vmr);
 		MinecraftForge.EVENT_BUS.register(this);
+		MinecraftForge.EVENT_BUS.register(new ClientEventHandler());
+		MinecraftForge.EVENT_BUS.register(drawBlockHighlightHandler);
 	}
 
 	@Override

src/main/java/labyrinth/ClientProxy.java

@@ -6,34 +6,34 @@
 
 import labyrinth.command.*;
 import labyrinth.config.LabyrinthConfig;
-import labyrinth.entity.EntityEraserFrame;
 import labyrinth.event.EntityEventHandler;
 import labyrinth.init.LabyrinthBlocks;
 import labyrinth.init.LabyrinthEntities;
 import labyrinth.init.LabyrinthItems;
 import labyrinth.init.RegistryEventHandler;
+import labyrinth.item.LabyrinthCreativeTab;
 import labyrinth.tileentity.TileEntityVillageMarket;
 import labyrinth.world.WorldEventHandler;
 import labyrinth.worldgen.LabyrinthWorldGen;
 import net.minecraft.entity.EnumCreatureType;
-import net.minecraft.util.ResourceLocation;
+import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.biome.Biome;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.config.Configuration;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.Mod.EventHandler;
 import net.minecraftforge.fml.common.SidedProxy;
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
-import net.minecraftforge.fml.common.registry.EntityRegistry;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 
 @Mod(modid = LabyrinthMod.MODID, name = LabyrinthMod.NAME, version = LabyrinthMod.VERSION, guiFactory = LabyrinthMod.GUI_FACTORY, dependencies = "required-after:cubicchunks")
 public class LabyrinthMod {
 	public static final String MODID = "labyrinth";
 	public static final String NAME = "Labyrinth";
-	public static final String VERSION = "0.2.6";
+	public static final String VERSION = "0.3.0";
 	public static final String GUI_FACTORY = "labyrinth.gui.LabyrinthGuiFactory";
 
 	public static Logger log;
@@ -42,33 +42,40 @@ public class LabyrinthMod {
 	public static LabyrinthConfig config;
 
 	public static boolean DEBUG_STOP_ENTITY_TICK = false;
+	public static LabyrinthCreativeTab creativeTab;
 
 	@EventHandler
 	public void preInit(FMLPreInitializationEvent event) throws IOException, IllegalAccessException {
 		log = event.getModLog();
 		config = new LabyrinthConfig(new Configuration(event.getSuggestedConfigurationFile()));
 		MinecraftForge.EVENT_BUS.register(config);
 		MinecraftForge.EVENT_BUS.register(new WorldEventHandler());
+		creativeTab = new LabyrinthCreativeTab("labyrinth.tab");
 		LabyrinthBlocks.init();
 		LabyrinthItems.init();
 		LabyrinthBlocks.register();
 		LabyrinthItems.register();
 		proxy.preInit();
 		LabyrinthEntities.register(this);
-		MinecraftForge.EVENT_BUS.register(new LabyrinthWorldGen());
 		MinecraftForge.EVENT_BUS.register(new EntityEventHandler());
 		MinecraftForge.EVENT_BUS.register(new RegistryEventHandler());
+		MinecraftForge.EVENT_BUS.register(new LabyrinthWorldGen());
 		if (config.shouldRemoveMobSpawn())
 			for (Biome biome : Biome.REGISTRY) {
 				biome.getSpawnableList(EnumCreatureType.MONSTER).clear();
 			}
-		EntityRegistry.registerModEntity(new ResourceLocation(MODID, "eraser_frame"), EntityEraserFrame.class, "EraserFrame", 255, this, 64, 1, true);
-		GameRegistry.registerTileEntity(TileEntityVillageMarket.class, MODID+":counter");
+		TileEntity.register(MODID+":counter", TileEntityVillageMarket.class);
+	}
+	
+	
+	@EventHandler
+	public void init(FMLInitializationEvent event) throws IOException {
+		LabyrinthWorldGen.instance.storage.defineCandidates();
 	}
 
 	@EventHandler
-	public void init(FMLInitializationEvent event) {
-		proxy.registerRenders();
+	public void postInit(FMLPostInitializationEvent event) {
+		LabyrinthMod.proxy.registerRenders();
 	}
 
 
@@ -77,14 +84,12 @@ public void serverStart(FMLServerStartingEvent event) {
 		event.registerServerCommand(new LWriteCubeCommand());
 		event.registerServerCommand(new LPlaceCubeCommand());
 		event.registerServerCommand(new LMixInCubeCommand());
-		event.registerServerCommand(new LGetStructureInfo());
-		event.registerServerCommand(new LPlaceStructureBlock());
+//		event.registerServerCommand(new LGetStructureInfo());
+//		event.registerServerCommand(new LPlaceStructureBlock());
 		event.registerServerCommand(new LWriteWithRotationsCommand());
-		event.registerServerCommand(new LStopEntityTick());
-		event.registerServerCommand(new LFindAVillage());
-		event.registerServerCommand(new LVillageInfo());
-		event.registerServerCommand(new LThickenWalls());
-		event.registerServerCommand(new LAlignPlatforms());
-		event.registerServerCommand(new LRemoveFence());
+//		event.registerServerCommand(new LVillageInfo());
+//		event.registerServerCommand(new LThickenWalls());
+//		event.registerServerCommand(new LAlignPlatforms());
+//		event.registerServerCommand(new LRemoveFence());
 	}
 }

src/main/java/labyrinth/LabyrinthMod.java

@@ -33,7 +33,8 @@ public enum ServerCommands {
 
 	public enum ClientCommands {
 		SHOW_ERASER_FRAME,
-		OPEN_GUI_VILLAGE_MARKET;
+		OPEN_GUI_VILLAGE_MARKET,
+		HIDE_ERASER_FRAME;
 	}
 
 	public ServerNetworkHandler() {
@@ -71,6 +72,14 @@ public void showEraserFrameForPlayer(EntityPlayer player, BlockPos from, BlockPo
 		byteBufOutputStream.writeBlockPos(to);
 		channel.sendTo(new FMLProxyPacket(byteBufOutputStream, LabyrinthMod.MODID), (EntityPlayerMP) player);
 	}
+	
+	public void hideEraserFrameForPlayer(EntityPlayer player) {
+		ByteBuf bb = Unpooled.buffer(36);
+		PacketBuffer byteBufOutputStream = new PacketBuffer(bb);
+		byteBufOutputStream.writeByte(ClientCommands.HIDE_ERASER_FRAME.ordinal());
+		channel.sendTo(new FMLProxyPacket(byteBufOutputStream, LabyrinthMod.MODID), (EntityPlayerMP) player);
+	}
+
 
 	@SuppressWarnings("rawtypes")
 	public void sendOpenGuiVillageMarket(List vl, EntityPlayer playerIn, World worldIn) {

src/main/java/labyrinth/ServerNetworkHandler.java

@@ -0,0 +1,54 @@
+package labyrinth.client;
+
+import labyrinth.client.model.ModelMiniSpider;
+import net.minecraftforge.client.event.ClientChatEvent;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+
+public class ClientEventHandler {
+	/*
+	@SubscribeEvent
+	public void onChatMesage(ClientChatEvent event) {
+		String text = event.getMessage();
+		if (text.startsWith("/leg")) {
+			String[] args = text.split(" ");
+			if (args[1].equalsIgnoreCase("ps")) {
+				if(args.length<8)
+					return;
+				float x = Float.parseFloat(args[2]);
+				float y = Float.parseFloat(args[3]);
+				float z = Float.parseFloat(args[4]);
+				int dx = Integer.parseInt(args[5]);
+				int dy = Integer.parseInt(args[6]);
+				int dz = Integer.parseInt(args[7]);
+				ModelMiniSpider.setLegPosAndScale(x, y, z, dx, dy, dz);
+			}
+			if (args[1].equalsIgnoreCase("rp")) {
+				if(args.length<5)
+					return;
+				float x = Float.parseFloat(args[2]);
+				float y = Float.parseFloat(args[3]);
+				float z = Float.parseFloat(args[4]);
+				ModelMiniSpider.setLegRotationPoint(x, y, z);
+			}
+			if (args[1].equalsIgnoreCase("fr")) {
+				if (args[2].equalsIgnoreCase("y"))
+					ModelMiniSpider.flipRotateY();
+				if (args[2].equalsIgnoreCase("z"))
+					ModelMiniSpider.flipRotateZ();
+
+			}
+		}
+		if (text.startsWith("/body")) {
+			String[] args = text.split(" ");
+			if (args[1].equalsIgnoreCase("ps")) {
+				float x = Float.parseFloat(args[2]);
+				float y = Float.parseFloat(args[3]);
+				float z = Float.parseFloat(args[4]);
+				int dx = Integer.parseInt(args[5]);
+				int dy = Integer.parseInt(args[6]);
+				int dz = Integer.parseInt(args[7]);
+				ModelMiniSpider.setBodyPosAndScale(x, y, z, dx, dy, dz);
+			}
+		}
+	}*/
+}

src/main/java/labyrinth/client/ClientEventHandler.java

@@ -55,4 +55,8 @@ public int getIconHeight() {
 	public int getIconWidth() {
 		return sprite.getIconWidth();
 	}
+	
+	public TextureAtlasSprite getTextureAtlasSprite() {
+		return sprite;
+	}
 }