R3944Realms/CarryOn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tons of Bugfixes

Browse Source
This commit is contained in:
Tschipp 2018-01-22 00:00:34 +01:00
parent 9d897760a2
commit cf2b6001b1
4 changed files with 46 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/tschipp/carryon/client/event/RenderEvents.java
View File

@ -16,6 +16,8 @@ import net.minecraft.client.renderer.OpenGlHelper;
import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.IBakedModel;
import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.client.renderer.entity.RenderPlayer; import net.minecraft.client.renderer.entity.RenderPlayer;
import net.minecraft.client.renderer.texture.TextureManager;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.client.resources.DefaultPlayerSkin; import net.minecraft.client.resources.DefaultPlayerSkin;
import net.minecraft.client.settings.GameSettings; import net.minecraft.client.settings.GameSettings;
import net.minecraft.client.settings.KeyBinding; import net.minecraft.client.settings.KeyBinding;
@ -29,11 +31,13 @@ import net.minecraft.util.EnumHand;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.client.event.GuiOpenEvent; import net.minecraftforge.client.event.GuiOpenEvent;
import net.minecraftforge.client.event.MouseEvent; import net.minecraftforge.client.event.MouseEvent;
import net.minecraftforge.client.event.RenderHandEvent; import net.minecraftforge.client.event.RenderHandEvent;
import net.minecraftforge.client.event.RenderPlayerEvent; import net.minecraftforge.client.event.RenderPlayerEvent;
import net.minecraftforge.client.event.RenderWorldLastEvent;
import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.gameevent.InputEvent; import net.minecraftforge.fml.common.gameevent.InputEvent;
@ -183,12 +187,13 @@ public class RenderEvents
AbstractClientPlayer aplayer = (AbstractClientPlayer) player; AbstractClientPlayer aplayer = (AbstractClientPlayer) player;
ItemStack stack = player.getHeldItemMainhand(); ItemStack stack = player.getHeldItemMainhand();
int perspective = Minecraft.getMinecraft().gameSettings.thirdPersonView; int perspective = Minecraft.getMinecraft().gameSettings.thirdPersonView;
boolean f1 = Minecraft.getMinecraft().gameSettings.hideGUI;
if (!stack.isEmpty() && stack.getItem() == RegistrationHandler.itemTile && ItemTile.hasTileData(stack))
if (!stack.isEmpty() && stack.getItem() == RegistrationHandler.itemTile && ItemTile.hasTileData(stack) && perspective == 0 && !f1)
{ {
if(Loader.isModLoaded("realrender") || Loader.isModLoaded("rfpr")) if (Loader.isModLoaded("realrender") || Loader.isModLoaded("rfpr"))
return; return;
Block block = ItemTile.getBlock(stack); Block block = ItemTile.getBlock(stack);
NBTTagCompound tag = ItemTile.getTileData(stack); NBTTagCompound tag = ItemTile.getTileData(stack);
IBlockState state = ItemTile.getBlockState(stack); IBlockState state = ItemTile.getBlockState(stack);
@ -208,8 +213,6 @@ public class RenderEvents
GlStateManager.rotate(8, 1f, 0, 0); GlStateManager.rotate(8, 1f, 0, 0);
} }
if (perspective == 0)
{
IBakedModel model = ModelOverridesHandler.hasCustomOverrideModel(state, tag) ? ModelOverridesHandler.getCustomOverrideModel(state, tag, world, player) : Minecraft.getMinecraft().getRenderItem().getItemModelWithOverrides(tileStack, world, player); IBakedModel model = ModelOverridesHandler.hasCustomOverrideModel(state, tag) ? ModelOverridesHandler.getCustomOverrideModel(state, tag, world, player) : Minecraft.getMinecraft().getRenderItem().getItemModelWithOverrides(tileStack, world, player);
CarryOnOverride carryOverride = ScriptChecker.getOverride(player); CarryOnOverride carryOverride = ScriptChecker.getOverride(player);
@ -241,6 +244,8 @@ public class RenderEvents
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
this.setLightmapDisabled(false); this.setLightmapDisabled(false);
Minecraft.getMinecraft().getTextureManager().bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
if (ModelOverridesHandler.hasCustomOverrideModel(state, tag)) if (ModelOverridesHandler.hasCustomOverrideModel(state, tag))
{ {
Object override = ModelOverridesHandler.getOverrideObject(state, tag); Object override = ModelOverridesHandler.getOverrideObject(state, tag);
@ -259,7 +264,7 @@ public class RenderEvents
{ {
Minecraft.getMinecraft().getRenderItem().renderItem(tileStack.isEmpty() ? stack : tileStack, model); Minecraft.getMinecraft().getRenderItem().renderItem(tileStack.isEmpty() ? stack : tileStack, model);
} }
this.setLightmapDisabled(true); this.setLightmapDisabled(true);
if (perspective == 0) if (perspective == 0)
@ -267,7 +272,6 @@ public class RenderEvents
event.setCanceled(true); event.setCanceled(true);
} }
}
GlStateManager.scale(1, 1, 1); GlStateManager.scale(1, 1, 1);
GlStateManager.popMatrix(); GlStateManager.popMatrix();
@ -290,6 +294,7 @@ public class RenderEvents
} }
} }
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
private int getBrightnessForRender(EntityPlayer player) private int getBrightnessForRender(EntityPlayer player)
{ {
@ -361,19 +366,18 @@ public class RenderEvents
GlStateManager.translate(xOffset, yOffset, zOffset); GlStateManager.translate(xOffset, yOffset, zOffset);
GlStateManager.scale(0.6, 0.6, 0.6); GlStateManager.scale(0.6, 0.6, 0.6);
if (CarryOnConfig.settings.facePlayer ? !isChest(block) : isChest(block)) if (CarryOnConfig.settings.facePlayer ? !isChest(block) : isChest(block))
{ {
GlStateManager.rotate(rotation, 0, 1.0f, 0); GlStateManager.rotate(rotation, 0, 1.0f, 0);
GlStateManager.translate(0, 1.6, 0.65); GlStateManager.translate(0, 1.6, 0.65);
if((Loader.isModLoaded("realrender") || Loader.isModLoaded("rfpr")) && Minecraft.getMinecraft().gameSettings.thirdPersonView == 0) if ((Loader.isModLoaded("realrender") || Loader.isModLoaded("rfpr")) && Minecraft.getMinecraft().gameSettings.thirdPersonView == 0)
GlStateManager.translate(0, 0, -0.4); GlStateManager.translate(0, 0, -0.4);
} }
else else
{ {
GlStateManager.rotate(rotation + 180, 0, 1.0f, 0); GlStateManager.rotate(rotation + 180, 0, 1.0f, 0);
GlStateManager.translate(0, 1.6, -0.65); GlStateManager.translate(0, 1.6, -0.65);
if((Loader.isModLoaded("realrender") || Loader.isModLoaded("rfpr")) && Minecraft.getMinecraft().gameSettings.thirdPersonView == 0) if ((Loader.isModLoaded("realrender") || Loader.isModLoaded("rfpr")) && Minecraft.getMinecraft().gameSettings.thirdPersonView == 0)
GlStateManager.translate(0, 0, 0.4); GlStateManager.translate(0, 0, 0.4);
} }
@ -406,6 +410,8 @@ public class RenderEvents
} }
Minecraft.getMinecraft().getTextureManager().bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
if (ModelOverridesHandler.hasCustomOverrideModel(state, tag)) if (ModelOverridesHandler.hasCustomOverrideModel(state, tag))
{ {
Object override = ModelOverridesHandler.getOverrideObject(state, tag); Object override = ModelOverridesHandler.getOverrideObject(state, tag);
@ -506,7 +512,7 @@ public class RenderEvents
this.fakeLeftArmwear.isHidden = false; this.fakeLeftArmwear.isHidden = false;
this.fakeRightArm.isHidden = false; this.fakeRightArm.isHidden = false;
this.fakeRightArmwear.isHidden = false; this.fakeRightArmwear.isHidden = false;
Minecraft.getMinecraft().getTextureManager().bindTexture(skinLoc); Minecraft.getMinecraft().getTextureManager().bindTexture(skinLoc);
if (aplayer.getSkinType().equals("default")) if (aplayer.getSkinType().equals("default"))
@ -550,7 +556,6 @@ public class RenderEvents
model.bipedRightArm.isHidden = false; model.bipedRightArm.isHidden = false;
model.bipedRightArmwear.isHidden = false; model.bipedRightArmwear.isHidden = false;
} }
if (!renderLeft) if (!renderLeft)
{ {
@ -559,7 +564,6 @@ public class RenderEvents
model.bipedLeftArm.isHidden = false; model.bipedLeftArm.isHidden = false;
model.bipedLeftArmwear.isHidden = false; model.bipedLeftArmwear.isHidden = false;
} }
if (rotLeft != null) if (rotLeft != null)
{ {

25
src/main/java/tschipp/carryon/common/config/Configs.java
View File

@ -131,6 +131,8 @@ public class Configs {
"animania:hamster", "animania:hamster",
"animania:ferret*", "animania:ferret*",
"animania:hedgehog*", "animania:hedgehog*",
"animania:cart",
"animania:wagon",
"mynko:*" "mynko:*"
}; };
} }
@ -154,6 +156,7 @@ public class Configs {
"minecraft:flower_pot->(block)minecraft:flower_pot", "minecraft:flower_pot->(block)minecraft:flower_pot",
"minecraft:leaves2->(item)minecraft:leaves2", "minecraft:leaves2->(item)minecraft:leaves2",
"minecraft:reeds->(block)minecraft:reeds", "minecraft:reeds->(block)minecraft:reeds",
"minecraft:daylight_detector_inverted->minecraft:daylight_detector",
"quark:custom_chest{type:\"spruce\"}->quark:custom_chest;0", "quark:custom_chest{type:\"spruce\"}->quark:custom_chest;0",
"quark:custom_chest{type:\"birch\"}->quark:custom_chest;1", "quark:custom_chest{type:\"birch\"}->quark:custom_chest;1",
"quark:custom_chest{type:\"jungle\"}->quark:custom_chest;2", "quark:custom_chest{type:\"jungle\"}->quark:custom_chest;2",
@ -190,17 +193,17 @@ public class Configs {
"storagedrawers:basicdrawers;4{Mat:\"acacia\"}->storagedrawers:basicdrawers;4{material:\"acacia\"}", "storagedrawers:basicdrawers;4{Mat:\"acacia\"}->storagedrawers:basicdrawers;4{material:\"acacia\"}",
"storagedrawers:basicdrawers;4{Mat:\"dark_oak\"}->storagedrawers:basicdrawers;4{material:\"dark_oak\"}", "storagedrawers:basicdrawers;4{Mat:\"dark_oak\"}->storagedrawers:basicdrawers;4{material:\"dark_oak\"}",
"animania:block_nest->(block)animania:block_nest", "animania:block_nest->(block)animania:block_nest",
"animania:cheese_mold;0->(block)cheese_mold;0", "animania:cheese_mold;0->(block)animania:cheese_mold;0",
"animania:cheese_mold;1->(block)cheese_mold;1", "animania:cheese_mold;1->(block)animania:cheese_mold;1",
"animania:cheese_mold;2->(block)cheese_mold;2", "animania:cheese_mold;2->(block)animania:cheese_mold;2",
"animania:cheese_mold;3->(block)cheese_mold;3", "animania:cheese_mold;3->(block)animania:cheese_mold;3",
"animania:cheese_mold;4->(block)cheese_mold;4", "animania:cheese_mold;4->(block)animania:cheese_mold;4",
"animania:cheese_mold;5->(block)cheese_mold;5", "animania:cheese_mold;5->(block)animania:cheese_mold;5",
"animania:cheese_mold;6->(block)cheese_mold;6", "animania:cheese_mold;6->(block)animania:cheese_mold;6",
"animania:cheese_mold;7->(block)cheese_mold;7", "animania:cheese_mold;7->(block)animania:cheese_mold;7",
"animania:cheese_mold;8->(block)cheese_mold;8", "animania:cheese_mold;8->(block)animania:cheese_mold;8",
"animania:cheese_mold;9->(block)cheese_mold;9", "animania:cheese_mold;9->(block)animania:cheese_mold;9",
"animania:cheese_mold;10->(block)cheese_mold;10", "animania:cheese_mold;10->(block)animania:cheese_mold;10",
}; };
} }

26
src/main/java/tschipp/carryon/common/event/ItemEvents.java
View File

@ -93,9 +93,9 @@ public class ItemEvents
eitem.setEntityItemStack(ItemStack.EMPTY); eitem.setEntityItemStack(ItemStack.EMPTY);
} }
} }
} }
@SubscribeEvent @SubscribeEvent
public void onPlayerLogin(PlayerLoggedInEvent event) public void onPlayerLogin(PlayerLoggedInEvent event)
{ {
@ -127,7 +127,6 @@ public class ItemEvents
} }
} }
@SubscribeEvent @SubscribeEvent
public void onEntityStartTracking(StartTracking event) public void onEntityStartTracking(StartTracking event)
@ -163,17 +162,16 @@ public class ItemEvents
} }
} }
@SubscribeEvent @SubscribeEvent
public void harvestSpeed(BreakSpeed event) public void harvestSpeed(BreakSpeed event)
{ {
EntityPlayer player = event.getEntityPlayer(); EntityPlayer player = event.getEntityPlayer();
if(player != null) if (player != null)
{ {
ItemStack stack = player.getHeldItemMainhand(); ItemStack stack = player.getHeldItemMainhand();
if(!stack.isEmpty() && (stack.getItem() == RegistrationHandler.itemTile || stack.getItem() == RegistrationHandler.itemEntity)) if (!stack.isEmpty() && (stack.getItem() == RegistrationHandler.itemTile || stack.getItem() == RegistrationHandler.itemEntity))
event.setNewSpeed(0); event.setNewSpeed(0);
} }
} }
@ -238,7 +236,7 @@ public class ItemEvents
} }
} }
} }
@SubscribeEvent @SubscribeEvent
public void onRespawn(PlayerEvent.Clone event) public void onRespawn(PlayerEvent.Clone event)
{ {
@ -248,18 +246,18 @@ public class ItemEvents
GameRules rules = player.world.getGameRules(); GameRules rules = player.world.getGameRules();
boolean keepInv = rules.getBoolean("keepInventory"); boolean keepInv = rules.getBoolean("keepInventory");
boolean wasCarrying = player.inventory.hasItemStack(new ItemStack(RegistrationHandler.itemTile)) || player.inventory.hasItemStack(new ItemStack(RegistrationHandler.itemEntity)); boolean wasCarrying = player.inventory.hasItemStack(new ItemStack(RegistrationHandler.itemTile)) || player.inventory.hasItemStack(new ItemStack(RegistrationHandler.itemEntity));
if((wasDead ? keepInv : true) && wasCarrying) if ((wasDead ? keepInv : true) && wasCarrying)
{ {
int carrySlot = original.inventory.currentItem; int carrySlot = original.inventory.currentItem;
ItemStack stack = player.inventory.removeStackFromSlot(carrySlot); ItemStack stack = player.inventory.removeStackFromSlot(carrySlot);
World world = player.world; World world = player.world;
EntityItem item = new EntityItem(world); EntityItem item = new EntityItem(world);
item.setEntityItemStack(stack); item.setEntityItemStack(stack);
BlockPos pos = original.getBedLocation(); BlockPos pos = original.getBedLocation();
if(pos == null) if (pos == null)
pos = player.getPosition(); pos = player.getPosition();
item.setPosition(pos.getX(), pos.getY(), pos.getZ()); item.setPosition(pos.getX(), pos.getY(), pos.getZ());
world.spawnEntity(item); world.spawnEntity(item);

6
src/main/java/tschipp/carryon/common/item/ItemTile.java
View File

@ -7,8 +7,7 @@ import java.util.List;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockDirectional; import net.minecraft.block.BlockStairs;
import net.minecraft.block.BlockHorizontal;
import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.IProperty;
import net.minecraft.block.properties.PropertyDirection; import net.minecraft.block.properties.PropertyDirection;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
@ -31,7 +30,6 @@ import net.minecraft.util.text.TextComponentString;
import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TextFormatting;
import net.minecraft.util.text.event.ClickEvent; import net.minecraft.util.text.event.ClickEvent;
import net.minecraft.util.text.event.ClickEvent.Action; import net.minecraft.util.text.event.ClickEvent.Action;
import net.minecraft.util.text.translation.I18n;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.fml.common.network.NetworkRegistry.TargetPoint; import net.minecraftforge.fml.common.network.NetworkRegistry.TargetPoint;
import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.common.registry.GameRegistry;
@ -119,7 +117,7 @@ public class ItemTile extends Item
if (prop instanceof PropertyDirection && this.equal(allowedValues, EnumFacing.HORIZONTALS)) if (prop instanceof PropertyDirection && this.equal(allowedValues, EnumFacing.HORIZONTALS))
{ {
world.setBlockState(pos2, containedstate.withProperty(prop, facing2.getOpposite())); world.setBlockState(pos2, containedstate.withProperty(prop, containedblock instanceof BlockStairs ? facing2 : facing2.getOpposite()));
set = true; set = true;
} }
else if (prop instanceof PropertyDirection && this.equal(allowedValues, EnumFacing.VALUES)) else if (prop instanceof PropertyDirection && this.equal(allowedValues, EnumFacing.VALUES))