Skip to content

Commit

Permalink
Finish PNG Parser, and import saved png files.
Browse files Browse the repository at this point in the history
Remove ImageClipboard output option, java sucks.
Massive localization and message changes.
  • Loading branch information
AlgorithmX2 committed Dec 9, 2017
1 parent 2ae9750 commit f880c74
Show file tree
Hide file tree
Showing 48 changed files with 261 additions and 149 deletions.
2 changes: 1 addition & 1 deletion src/main/java/mod/chiselsandbits/bitbag/BagGui.java
Expand Up @@ -6,8 +6,8 @@

import mod.chiselsandbits.core.ChiselsAndBits;
import mod.chiselsandbits.core.ClientSide;
import mod.chiselsandbits.helpers.LocalStrings;
import mod.chiselsandbits.helpers.ModUtil;
import mod.chiselsandbits.localization.LocalStrings;
import mod.chiselsandbits.network.NetworkRouter;
import mod.chiselsandbits.network.packets.PacketBagGui;
import mod.chiselsandbits.network.packets.PacketClearBagGui;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/mod/chiselsandbits/bitbag/BagInventory.java
Expand Up @@ -11,10 +11,10 @@
import javax.annotation.Nonnull;

import mod.chiselsandbits.core.ChiselsAndBits;
import mod.chiselsandbits.helpers.LocalStrings;
import mod.chiselsandbits.helpers.ModUtil;
import mod.chiselsandbits.items.ItemBitBag;
import mod.chiselsandbits.items.ItemChiseledBit;
import mod.chiselsandbits.localization.LocalStrings;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
Expand Down
Expand Up @@ -3,7 +3,7 @@
import java.util.List;

import mod.chiselsandbits.core.ChiselsAndBits;
import mod.chiselsandbits.helpers.LocalStrings;
import mod.chiselsandbits.localization.LocalStrings;
import net.minecraft.block.Block;
import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.item.ItemBlock;
Expand Down
Expand Up @@ -111,7 +111,7 @@ public void loadData(
is.reset();

// load png? or is it text?
if ( peek[0] == 0x89 && peek[1] == 0x50 && peek[2] == 0x4E && peek[3] == 0x47 )
if ( peek[0] == (byte) 0x89 && peek[1] == 0x50 && peek[2] == 0x4E && peek[3] == 0x47 )
{
data = new ShareWorldData( ImageIO.read( is ) );
}
Expand Down
Expand Up @@ -12,7 +12,7 @@
import mod.chiselsandbits.core.ChiselsAndBits;
import mod.chiselsandbits.core.Log;
import mod.chiselsandbits.helpers.DeprecationHelper;
import mod.chiselsandbits.helpers.LocalStrings;
import mod.chiselsandbits.localization.LocalStrings;
import mod.chiselsandbits.network.NetworkRouter;
import mod.chiselsandbits.network.packets.PacketBlueprintSet;
import net.minecraft.client.gui.GuiButton;
Expand Down
19 changes: 9 additions & 10 deletions src/main/java/mod/chiselsandbits/blueprints/EntityBlueprint.java
Expand Up @@ -5,7 +5,7 @@
import java.nio.file.NoSuchFileException;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
Expand All @@ -17,8 +17,8 @@
import mod.chiselsandbits.chiseledblock.data.VoxelBlobStateReference;
import mod.chiselsandbits.core.ChiselsAndBits;
import mod.chiselsandbits.helpers.ActingPlayer;
import mod.chiselsandbits.helpers.LocalStrings;
import mod.chiselsandbits.helpers.ModUtil;
import mod.chiselsandbits.localization.LocalStrings;
import mod.chiselsandbits.modes.WrenchModes;
import mod.chiselsandbits.network.NetworkRouter;
import mod.chiselsandbits.network.packets.PacketCompleteBlueprint;
Expand All @@ -27,7 +27,6 @@
import mod.chiselsandbits.network.packets.WriteBlueprintPacket;
import mod.chiselsandbits.share.ShareGenerator;
import mod.chiselsandbits.share.output.ClipBoardText;
import mod.chiselsandbits.share.output.ClipboardImage;
import mod.chiselsandbits.share.output.IShareOutput;
import mod.chiselsandbits.share.output.LocalPNGFile;
import mod.chiselsandbits.share.output.LocalTextFile;
Expand All @@ -53,6 +52,7 @@
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.util.math.Vec3d;
import net.minecraft.util.text.TextComponentString;
import net.minecraft.util.text.TextComponentTranslation;
import net.minecraft.world.World;

Expand Down Expand Up @@ -395,6 +395,9 @@ private void beginCapture(
{
if ( player.getEntityWorld().isRemote )
{
if ( getDataManager().get( BLUEPRINT_PLACING ) )
return;

getDataManager().set( BLUEPRINT_PLACING, true );
sendUpdate();
player.addChatMessage( new TextComponentTranslation( LocalStrings.BlueprintBeginCapture.toString() ) );
Expand All @@ -407,9 +410,6 @@ private void beginCapture(
{
switch ( ChiselsAndBits.getConfig().shareOutput )
{
case IMAGE_CLIPBOARD:
out = new ClipboardImage();
break;
case IMAGE_FILE_WITH_SCREENSHOT:
out = new LocalPNGFile( newFileName( ChiselsAndBits.getConfig().getShareFileOutputFolder(), ".png" ) );
break;
Expand Down Expand Up @@ -440,7 +440,7 @@ public void run()
wp.setFrom( getEntityId(), data );

NetworkRouter.instance.sendToServer( wp );
player.addChatMessage( new TextComponentTranslation( sg.message ) );
player.addChatMessage( new TextComponentString( sg.message.toString() ) );
}
catch ( IOException ioe )
{
Expand All @@ -461,14 +461,13 @@ private File newFileName(
String shareFileOutputFolder,
String type ) throws NoSuchFileException
{
DateFormat dateFormat = new SimpleDateFormat( "yyyy/MM/dd HH:mm:ss" );
Calendar cal = Calendar.getInstance();
DateFormat dateFormat = new SimpleDateFormat( "yyyy-MM-dd-HH-mm-ss" );
String extra = "";

int loops = 0;
while ( loops++ < 1000 )
{
File o = new File( shareFileOutputFolder, dateFormat.format( cal ) + extra + type );
File o = new File( shareFileOutputFolder, dateFormat.format( new Date() ) + extra + type );
if ( !o.exists() )
return o;

Expand Down
Expand Up @@ -15,10 +15,10 @@
import mod.chiselsandbits.helpers.BitOperation;
import mod.chiselsandbits.helpers.DeprecationHelper;
import mod.chiselsandbits.helpers.ExceptionNoTileEntity;
import mod.chiselsandbits.helpers.LocalStrings;
import mod.chiselsandbits.helpers.ModUtil;
import mod.chiselsandbits.interfaces.IItemScrollWheel;
import mod.chiselsandbits.interfaces.IVoxelBlobItem;
import mod.chiselsandbits.localization.LocalStrings;
import mod.chiselsandbits.network.NetworkRouter;
import mod.chiselsandbits.network.packets.PacketAccurateSneakPlace;
import mod.chiselsandbits.network.packets.PacketAccurateSneakPlace.IItemBlockAccurate;
Expand Down
Expand Up @@ -31,9 +31,9 @@
import mod.chiselsandbits.core.ChiselsAndBits;
import mod.chiselsandbits.core.Log;
import mod.chiselsandbits.helpers.DeprecationHelper;
import mod.chiselsandbits.helpers.LocalStrings;
import mod.chiselsandbits.helpers.ModUtil;
import mod.chiselsandbits.items.ItemChiseledBit;
import mod.chiselsandbits.localization.LocalStrings;
import mod.chiselsandbits.voxelspace.IVoxelSrc;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
Expand Down
Expand Up @@ -12,7 +12,7 @@
import mod.chiselsandbits.core.ClientSide;
import mod.chiselsandbits.helpers.ChiselToolType;
import mod.chiselsandbits.helpers.DeprecationHelper;
import mod.chiselsandbits.helpers.LocalStrings;
import mod.chiselsandbits.localization.LocalStrings;
import mod.chiselsandbits.modes.IToolMode;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen;
Expand Down
Expand Up @@ -4,6 +4,5 @@ public enum EnumShareOutput
{
TEXT_CLIPBOARD,
TEXT_FILE,
IMAGE_CLIPBOARD,
IMAGE_FILE_WITH_SCREENSHOT
}
2 changes: 1 addition & 1 deletion src/main/java/mod/chiselsandbits/config/ModConfig.java
Expand Up @@ -10,7 +10,7 @@
import java.util.Set;

import mod.chiselsandbits.core.ChiselsAndBits;
import mod.chiselsandbits.helpers.LocalStrings;
import mod.chiselsandbits.localization.LocalStrings;
import mod.chiselsandbits.modes.ChiselMode;
import mod.chiselsandbits.modes.PositivePatternMode;
import mod.chiselsandbits.modes.TapeMeasureModes;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/mod/chiselsandbits/core/ClientSide.java
Expand Up @@ -53,14 +53,14 @@
import mod.chiselsandbits.helpers.ChiselModeManager;
import mod.chiselsandbits.helpers.ChiselToolType;
import mod.chiselsandbits.helpers.DeprecationHelper;
import mod.chiselsandbits.helpers.LocalStrings;
import mod.chiselsandbits.helpers.ModUtil;
import mod.chiselsandbits.helpers.ReadyState;
import mod.chiselsandbits.integration.mcmultipart.MCMultipartProxy;
import mod.chiselsandbits.interfaces.IItemScrollWheel;
import mod.chiselsandbits.interfaces.IPatternItem;
import mod.chiselsandbits.items.ItemChisel;
import mod.chiselsandbits.items.ItemChiseledBit;
import mod.chiselsandbits.localization.LocalStrings;
import mod.chiselsandbits.modes.ChiselMode;
import mod.chiselsandbits.modes.IToolMode;
import mod.chiselsandbits.modes.PositivePatternMode;
Expand Down
40 changes: 6 additions & 34 deletions src/main/java/mod/chiselsandbits/helpers/ActingPlayer.java
@@ -1,6 +1,5 @@
package mod.chiselsandbits.helpers;

import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;

Expand All @@ -10,6 +9,8 @@
import mod.chiselsandbits.bitbag.BagInventory;
import mod.chiselsandbits.core.ClientSide;
import mod.chiselsandbits.items.ItemChiseledBit;
import mod.chiselsandbits.localization.ChiselErrors;
import mod.chiselsandbits.localization.LocalizedMessage;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
Expand Down Expand Up @@ -171,41 +172,15 @@ public BlockPos getPosition()
return getPlayer().getPosition();
}

class TrackerError
{
ChiselErrors msg;
Object[] args;

@Override
public int hashCode()
{
return msg.hashCode() ^ Arrays.hashCode( args );
}

@Override
public boolean equals(
Object obj )
{
TrackerError a = (TrackerError) obj;

if ( a.msg == this.msg )
{
return Arrays.equals( args, a.args );
}

return false;
}
};

// errors produced by operations are accumulated for display.
private final Set<TrackerError> errors = new HashSet<TrackerError>();
private final Set<LocalizedMessage> errors = new HashSet<LocalizedMessage>();

@SideOnly( Side.CLIENT )
private void innerDisplayError()
{
for ( final TrackerError err : errors )
for ( final LocalizedMessage err : errors )
{
ClientSide.instance.getPlayer().addChatMessage( new TextComponentString( err.msg.getLocal( err.args ) ) );
ClientSide.instance.getPlayer().addChatMessage( new TextComponentString( err.toString() ) );
}
}

Expand All @@ -225,10 +200,7 @@ public void report(
{
if ( this.getWorld().isRemote )
{
TrackerError trackerErr = new TrackerError();
trackerErr.msg = string;
trackerErr.args = vars;
errors.add( trackerErr );
errors.add( new LocalizedMessage( string, vars ) );
}
}

Expand Down
Expand Up @@ -7,6 +7,7 @@
import mod.chiselsandbits.core.ChiselsAndBits;
import mod.chiselsandbits.items.ItemBitBag;
import mod.chiselsandbits.items.ItemChiseledBit;
import mod.chiselsandbits.localization.ChiselErrors;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.inventory.IInventory;
Expand Down
Expand Up @@ -7,8 +7,8 @@
import mezz.jei.api.IModPlugin;
import mezz.jei.api.IModRegistry;
import mod.chiselsandbits.core.ChiselsAndBits;
import mod.chiselsandbits.helpers.LocalStrings;
import mod.chiselsandbits.helpers.ModUtil;
import mod.chiselsandbits.localization.LocalStrings;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/mod/chiselsandbits/items/ItemBitBag.java
Expand Up @@ -11,8 +11,8 @@
import mod.chiselsandbits.client.gui.ModGuiTypes;
import mod.chiselsandbits.core.ChiselsAndBits;
import mod.chiselsandbits.core.ClientSide;
import mod.chiselsandbits.helpers.LocalStrings;
import mod.chiselsandbits.helpers.ModUtil;
import mod.chiselsandbits.localization.LocalStrings;
import mod.chiselsandbits.network.NetworkRouter;
import mod.chiselsandbits.network.packets.PacketOpenGui;
import mod.chiselsandbits.render.helpers.SimpleInstanceCache;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/mod/chiselsandbits/items/ItemBitSaw.java
Expand Up @@ -3,7 +3,7 @@
import java.util.List;

import mod.chiselsandbits.core.ChiselsAndBits;
import mod.chiselsandbits.helpers.LocalStrings;
import mod.chiselsandbits.localization.LocalStrings;
import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/mod/chiselsandbits/items/ItemChisel.java
Expand Up @@ -20,17 +20,17 @@
import mod.chiselsandbits.core.ClientSide;
import mod.chiselsandbits.helpers.ActingPlayer;
import mod.chiselsandbits.helpers.BitOperation;
import mod.chiselsandbits.helpers.ChiselErrors;
import mod.chiselsandbits.helpers.ChiselModeManager;
import mod.chiselsandbits.helpers.ChiselToolType;
import mod.chiselsandbits.helpers.IContinuousInventory;
import mod.chiselsandbits.helpers.InfiniteBitStorage;
import mod.chiselsandbits.helpers.LocalStrings;
import mod.chiselsandbits.helpers.ModUtil;
import mod.chiselsandbits.helpers.ModUtil.ItemStackSlot;
import mod.chiselsandbits.integration.mcmultipart.MCMultipartProxy;
import mod.chiselsandbits.interfaces.IChiselModeItem;
import mod.chiselsandbits.interfaces.IItemScrollWheel;
import mod.chiselsandbits.localization.ChiselErrors;
import mod.chiselsandbits.localization.LocalStrings;
import mod.chiselsandbits.modes.ChiselMode;
import mod.chiselsandbits.modes.IToolMode;
import mod.chiselsandbits.network.NetworkRouter;
Expand Down
Expand Up @@ -23,12 +23,12 @@
import mod.chiselsandbits.helpers.ChiselToolType;
import mod.chiselsandbits.helpers.DeprecationHelper;
import mod.chiselsandbits.helpers.IContinuousInventory;
import mod.chiselsandbits.helpers.LocalStrings;
import mod.chiselsandbits.helpers.ModUtil;
import mod.chiselsandbits.helpers.ModUtil.ItemStackSlot;
import mod.chiselsandbits.interfaces.ICacheClearable;
import mod.chiselsandbits.interfaces.IChiselModeItem;
import mod.chiselsandbits.interfaces.IItemScrollWheel;
import mod.chiselsandbits.localization.LocalStrings;
import mod.chiselsandbits.modes.ChiselMode;
import mod.chiselsandbits.modes.IToolMode;
import mod.chiselsandbits.network.NetworkRouter;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/mod/chiselsandbits/items/ItemMallet.java
Expand Up @@ -5,7 +5,7 @@
import mod.chiselsandbits.blueprints.EntityBlueprint;
import mod.chiselsandbits.core.ChiselsAndBits;
import mod.chiselsandbits.core.ClientSide;
import mod.chiselsandbits.helpers.LocalStrings;
import mod.chiselsandbits.localization.LocalStrings;
import net.minecraft.client.Minecraft;
import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.entity.player.EntityPlayer;
Expand Down
Expand Up @@ -8,9 +8,9 @@
import mod.chiselsandbits.chiseledblock.data.VoxelBlob;
import mod.chiselsandbits.core.ChiselsAndBits;
import mod.chiselsandbits.core.ClientSide;
import mod.chiselsandbits.helpers.LocalStrings;
import mod.chiselsandbits.helpers.ModUtil;
import mod.chiselsandbits.interfaces.IPatternItem;
import mod.chiselsandbits.localization.LocalStrings;
import mod.chiselsandbits.render.helpers.SimpleInstanceCache;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
Expand Down
Expand Up @@ -16,12 +16,12 @@
import mod.chiselsandbits.helpers.ContinousChisels;
import mod.chiselsandbits.helpers.IContinuousInventory;
import mod.chiselsandbits.helpers.InfiniteBitStorage;
import mod.chiselsandbits.helpers.LocalStrings;
import mod.chiselsandbits.helpers.ModUtil;
import mod.chiselsandbits.integration.mcmultipart.MCMultipartProxy;
import mod.chiselsandbits.interfaces.IItemScrollWheel;
import mod.chiselsandbits.interfaces.IPatternItem;
import mod.chiselsandbits.interfaces.IVoxelBlobItem;
import mod.chiselsandbits.localization.LocalStrings;
import mod.chiselsandbits.network.NetworkRouter;
import mod.chiselsandbits.network.packets.PacketRotateVoxelBlob;
import mod.chiselsandbits.render.helpers.SimpleInstanceCache;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/mod/chiselsandbits/items/ItemPositivePrint.java
Expand Up @@ -14,16 +14,16 @@
import mod.chiselsandbits.core.ChiselsAndBits;
import mod.chiselsandbits.core.ClientSide;
import mod.chiselsandbits.helpers.ActingPlayer;
import mod.chiselsandbits.helpers.BitName;
import mod.chiselsandbits.helpers.ChiselErrors;
import mod.chiselsandbits.helpers.ContinousChisels;
import mod.chiselsandbits.helpers.IContinuousInventory;
import mod.chiselsandbits.helpers.InfiniteBitStorage;
import mod.chiselsandbits.helpers.LocalStrings;
import mod.chiselsandbits.helpers.ModUtil;
import mod.chiselsandbits.helpers.ModUtil.ItemStackSlot;
import mod.chiselsandbits.integration.mcmultipart.MCMultipartProxy;
import mod.chiselsandbits.interfaces.IChiselModeItem;
import mod.chiselsandbits.localization.BitName;
import mod.chiselsandbits.localization.ChiselErrors;
import mod.chiselsandbits.localization.LocalStrings;
import mod.chiselsandbits.modes.PositivePatternMode;
import mod.chiselsandbits.network.NetworkRouter;
import mod.chiselsandbits.network.packets.PacketAccurateSneakPlace;
Expand Down

0 comments on commit f880c74

Please sign in to comment.