Skip to content

Commit

Permalink
Initial changes to work with 1.10.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Ipsis committed Aug 16, 2016
1 parent 3d14a09 commit 7bb208b
Show file tree
Hide file tree
Showing 8 changed files with 73 additions and 177 deletions.
9 changes: 6 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {
}
}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT'
classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
}
}
apply plugin: 'net.minecraftforge.gradle.forge'
Expand Down Expand Up @@ -40,6 +40,9 @@ version = "${config.minecraft_version}-${config.mod_version}"
group= "com.ipsis.buildersguides" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "buildersguides"

sourceCompatibility = 1.8
targetCompatibility = 1.8

minecraft {
version = "${config.minecraft_version}-${config.forge_version}"
runDir = "run"
Expand All @@ -57,8 +60,8 @@ minecraft {
}

dependencies {
deobfCompile "mcp.mobius.waila:Waila:1.7.0-B2_1.9"
deobfCompile "mezz.jei:jei_1.9:3.2.4.177"
deobfCompile "mcp.mobius.waila:Waila:1.7.0-B3_1.9.4"
deobfCompile "mezz.jei:jei_1.9.4:3.4.0.202"
}

processResources
Expand Down
6 changes: 3 additions & 3 deletions build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ mod_version=0.3.1-beta
##############################
# Build Environment
##############################
minecraft_version=1.9
forge_version=12.16.1.1887
minecraft_mappings=snapshot_20160421
minecraft_version=1.10.2
forge_version=12.18.1.2045
minecraft_mappings=snapshot_20160803

##############################
# APIs
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,8 @@ public void onDrawBlockHighlightEvent(DrawBlockHighlightEvent event) {
* Vanilla block outline code
* But works on air
*/
GlStateManager.disableAlpha();
GlStateManager.enableBlend();
GlStateManager.tryBlendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO);
GlStateManager.color(0.0F, 0.0F, 0.0F, 0.4F);
GlStateManager.glLineWidth(2.0F);
GlStateManager.disableTexture2D();
GlStateManager.depthMask(false);
Expand All @@ -54,13 +52,12 @@ public void onDrawBlockHighlightEvent(DrawBlockHighlightEvent event) {
double d0 = entityPlayer.lastTickPosX + (entityPlayer.posX - entityPlayer.lastTickPosX) * (double)event.getPartialTicks();
double d1 = entityPlayer.lastTickPosY + (entityPlayer.posY - entityPlayer.lastTickPosY) * (double)event.getPartialTicks();
double d2 = entityPlayer.lastTickPosZ + (entityPlayer.posZ - entityPlayer.lastTickPosZ) * (double)event.getPartialTicks();
drawSelectionBoundingBox(iblockstate.getSelectedBoundingBox(world, blockpos).expandXyz(0.0020000000949949026D).offset(-d0, -d1, -d2));
drawSelectionBoundingBox(iblockstate.getSelectedBoundingBox(world, blockpos).expandXyz(0.0020000000949949026D).offset(-d0, -d1, -d2), 0.0F, 0.0F, 0.0F, 0.4F);
}

GlStateManager.depthMask(true);
GlStateManager.enableTexture2D();
GlStateManager.disableBlend();
GlStateManager.enableAlpha();

event.setCanceled(true);
}
Expand Down

This file was deleted.

This file was deleted.

6 changes: 0 additions & 6 deletions src/main/java/ipsis/buildersguides/proxy/ClientProxy.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,20 @@
import ipsis.buildersguides.block.BlockMarker;
import ipsis.buildersguides.init.ModBlocks;
import ipsis.buildersguides.init.ModItems;
import ipsis.buildersguides.network.PacketHandlerBG;
import ipsis.buildersguides.network.message.MessageTileEntityMarker;
import ipsis.buildersguides.tileentity.TileEntityMarker;
import ipsis.buildersguides.oss.client.ModelHelper;
import net.minecraft.item.Item;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.client.FMLClientHandler;
import net.minecraftforge.fml.client.registry.ClientRegistry;
import net.minecraftforge.fml.relauncher.Side;

import static ipsis.buildersguides.network.PacketHandlerBG.MARKER_TE_MSG_ID;

public class ClientProxy extends CommonProxy {

@Override
public void preInit() {

super.preInit();
PacketHandlerBG.INSTANCE.registerMessage(MessageTileEntityMarker.Handler.class, MessageTileEntityMarker.class, MARKER_TE_MSG_ID, Side.CLIENT);
}

@Override
Expand Down
4 changes: 0 additions & 4 deletions src/main/java/ipsis/buildersguides/proxy/CommonProxy.java
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
package ipsis.buildersguides.proxy;

import ipsis.buildersguides.network.PacketHandlerBG;
import ipsis.buildersguides.network.message.MessageHandlerMarkerDummy;
import ipsis.buildersguides.network.message.MessageKeyPressed;
import ipsis.buildersguides.network.message.MessageTileEntityMarker;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
import net.minecraftforge.fml.common.network.IGuiHandler;
import net.minecraftforge.fml.relauncher.Side;

import static ipsis.buildersguides.network.PacketHandlerBG.KEY_PRESSED_MSG_ID;
import static ipsis.buildersguides.network.PacketHandlerBG.MARKER_TE_MSG_ID;

public class CommonProxy implements IGuiHandler {

Expand All @@ -22,7 +19,6 @@ public void preInit() {
registerKeyBindings();

PacketHandlerBG.INSTANCE.registerMessage(MessageKeyPressed.Handler.class, MessageKeyPressed.class, KEY_PRESSED_MSG_ID, Side.SERVER);
PacketHandlerBG.INSTANCE.registerMessage(MessageHandlerMarkerDummy.class, MessageTileEntityMarker.class, MARKER_TE_MSG_ID, Side.SERVER);
}

public void init() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@

import ipsis.buildersguides.manager.MarkerManager;
import ipsis.buildersguides.manager.MarkerType;
import ipsis.buildersguides.network.PacketHandlerBG;
import ipsis.buildersguides.network.message.MessageTileEntityMarker;
import ipsis.buildersguides.util.BlockUtils;
import ipsis.buildersguides.util.ColorBG;
import ipsis.buildersguides.util.WorldHelper;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.network.Packet;
import net.minecraft.network.NetworkManager;
import net.minecraft.network.play.server.SPacketUpdateTileEntity;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.AxisAlignedBB;
Expand All @@ -16,6 +17,7 @@
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;

import javax.annotation.Nullable;
import java.util.*;

public class TileEntityMarker extends TileEntity {
Expand Down Expand Up @@ -122,10 +124,64 @@ public void rotateTile(EnumFacing side) {
facing = facing.rotateAround(side.getAxis());
}

@Nullable
@Override
public Packet getDescriptionPacket() {
public SPacketUpdateTileEntity getUpdatePacket() {

return PacketHandlerBG.INSTANCE.getPacketFrom(new MessageTileEntityMarker(this));
NBTTagCompound nbtTagCompound = getUpdateTag();
return new SPacketUpdateTileEntity(this.pos, getBlockMetadata(), nbtTagCompound);
}

@Override
public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity pkt) {

handleUpdateTag(pkt.getNbtCompound());
WorldHelper.updateClient(getWorld(), this);
}

@Override
public NBTTagCompound getUpdateTag() {

NBTTagCompound nbtTagCompound = new NBTTagCompound();
super.writeToNBT(nbtTagCompound);
nbtTagCompound.setByte("facing", (byte)facing.ordinal());
nbtTagCompound.setByte("type", (byte)type.ordinal());
nbtTagCompound.setByte("color", (byte)color.ordinal());
nbtTagCompound.setByte("mode", (byte)mode);

for (EnumFacing f : EnumFacing.values())
nbtTagCompound.setInteger("v_" + f.ordinal(), getV(f));

for (EnumFacing f : EnumFacing.values()) {
BlockPos targetPos = getTarget(f);
nbtTagCompound.setInteger("target" + f.ordinal() + "_x", targetPos.getX());
nbtTagCompound.setInteger("target" + f.ordinal() + "_y", targetPos.getY());
nbtTagCompound.setInteger("target" + f.ordinal() + "_z", targetPos.getZ());
}
return nbtTagCompound;
}

@Override
public void handleUpdateTag(NBTTagCompound tag) {

super.handleUpdateTag(tag);

setFacing(EnumFacing.getFront(tag.getByte("facing")));
setType(MarkerType.getMarkerType(tag.getByte("type")));
setColor(ColorBG.getColor(tag.getByte("color")));
setMode((tag.getByte("mode")));

for (EnumFacing f : EnumFacing.values()) {
setV(f, tag.getByte("v_" + f.ordinal()));
BlockPos targetPos = new BlockPos(
tag.getInteger("target" + f.ordinal() + "_x"),
tag.getInteger("target" + f.ordinal() + "_y"),
tag.getInteger("target" + f.ordinal() + "_z"));
setTarget(f, targetPos);
}

MarkerManager.handleServerUpdate(this);
BlockUtils.markBlockForUpdate(worldObj, this.getPos());
}

private static final int MAX_DISTANCE = 128;
Expand Down Expand Up @@ -175,7 +231,7 @@ public String toString() {
public static final String NBT_TARGET_LIST = "TargetList";

@Override
public void writeToNBT(NBTTagCompound compound) {
public NBTTagCompound writeToNBT(NBTTagCompound compound) {
super.writeToNBT(compound);

compound.setByte(NBT_TYPE, (byte)type.ordinal());
Expand Down Expand Up @@ -204,6 +260,7 @@ public void writeToNBT(NBTTagCompound compound) {
}
}
compound.setTag(NBT_TARGET_LIST, tagList);
return compound;
}

@Override
Expand Down

0 comments on commit 7bb208b

Please sign in to comment.