Merge pull request #126 from mcRPW/development

LICENSE.txt

@@ -1,8 +1,7 @@
 RPW LICENSE
 ===========
 
-* You're NOT ALLOWED to make money on RPW in any way (eg. adf.ly links), unless
-  you have contributed to the code in a significant way.
+* You're NOT ALLOWED to make money on RPW in any way (eg. adf.ly links)
 
 * In any case, you are NOT ALLOWED to sell RPW or it's parts.
 
@@ -32,4 +31,4 @@ INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
 PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
 HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

changelog.txt

@@ -1,10 +1,14 @@
-4.4.0
-440
-- You can now create custom languages with rpw
-- You now have the option to unzip your project when exporting to Minecraft
-- You can now change the pack description in the project properties and export project windows
-- You can now change the resourcepack format in the export project window
-- Hovering over entries in the asset tree now shows their file path in the status bar
-- Download latest version button now links to github instead of the website
-- There is now a link in the help menu to the changelog
-- Fixed #86 Editor commands don't work right with spaces
+4.5.0
+450
+- Added support for opening resourcepacks that are folders
+- Inproved texture stitcher and unstitcher:
+      - Added the ability to manually choose which textures to inport/export (Option to choose whole groups
+      excists aswell)
+      - Added the ability to scale textures instead which replaces force block size which only
+      worked for blocks and didn't work well with animated ones
+- Merged export to Minecraft and export for more options when exporting to specific folder
+- Added keybind for opening the manage languages dialog
+- Added support for multiple asset directories at the same time with the ability to easly switch between them. So you can work in 1.11 and then change to 1.12 in one project without having to update all your projects to 1.12.
+- Added fancy tree support for 1.10 - 1.12 textures
+- Added support for editing models
+- Fixed #122 Exporting to specific folder having a packmeta number of 0

resources/data/changelog/450.md

@@ -0,0 +1,12 @@
+- Added support for opening resourcepacks that are folders
+- Inproved texture stitcher and unstitcher:
+      - Added the ability to manually choose which textures to inport/export (Option to choose whole groups
+      excists aswell)
+      - Added the ability to scale textures instead which replaces force block size which only
+      worked for blocks and didn't work well with animated ones
+- Merged export to Minecraft and export for more options when exporting to specific folder
+- Added keybind for opening the manage languages dialog
+- Added support for multiple asset directories at the same time with the ability to easly switch between them. So you can work in 1.11 and then change to 1.12 in one project without having to update all your projects to 1.12.
+- Added fancy tree support for 1.10 - 1.12 textures
+- Added support for editing models
+- Fixed #122 Exporting to specific folder having a packmeta number of 0

resources/data/help/pack-library.md

@@ -11,6 +11,7 @@ a pack by right-clicking on a group or file in the main asset tree.
 
 All commands to work with library are located in the `Library` menu.
 
-Apart from working with library packs, there is also a command to re-extract MC 
-assets, which you can use after you install some mods into your mods folder, or 
-update the game, and want to see those changes in RPW.
+Apart from working with library packs, there is also a Configure Minecraft Assets dialog located at
+`Library > Configure Minecraft Assets` where you can choose which Minecraft version to use. To inport a new Minecraft
+version click the new button and select the correct version. You will also have the option to include mod files. After
+changing or inporting a new Minecraft version the tree will rebuild so that you will see the assets from that version.

resources/data/tree/filtersVanilla.ini

@@ -1,5 +1,5 @@
 # Group Filters for FANCY VIEW
-# Last updated for 1.9.x snapshots
+# Last updated for 1.12.2
 # (c) MightyPork
 
 
@@ -144,13 +144,13 @@ root.audio2.sound = ^s.*
 root.audio2 = NULL
 
 
-root.image.item.rare = ^ti.gold_nugget | ^ti.diamond | ^ti.emerald | ^ti.iron_ingot | ^ti.ruby | ^ti.gold_ingot | ^ti.coal | ^ti.charcoal | ^ti.glowstone_dust | ^ti.quartz | ^ti.flint | ^ti.prismarine_*
+root.image.item.rare = ^ti.gold_nugget | ^ti.diamond | ^ti.emerald | ^ti.iron_ingot | ^ti.ruby | ^ti.gold_ingot | ^ti.coal | ^ti.charcoal | ^ti.glowstone_dust | ^ti.quartz | ^ti.flint | ^ti.prismarine_* | ^ti.iron_nugget
 root.image.item.dyes = ^ti.dye_powder_*
 root.image.item.redstone = ^ti.hopper | ^ti.redstone_dust | ^ti.repeater | ^ti.comparator
 root.image.item.brewing = ^ti.brewing_stand | ^ti.cauldron | ^ti.potion_* | ^ti.dragon_breath | ^ti.experience_bottle
 root.image.item.records = ^ti.record_*
 root.image.item.horses = ^ti.*_horse_armor | ^ti.lead | ^ti.saddle | ^ti.name_tag | ^ti.carrot_on_a_stick
-root.image.item.mob_drops = ^ti.leather | ^ti.blaze* | ^ti.bone | ^ti.feather | ^ti.ender_pearl | ^ti.ender_eye | ^ti.ghast_tear | ^ti.gunpowder | ^ti.magma_cream | ^ti.nether_star | ^ti.rotten_flesh | ^ti.spider_eye* | ^ti.string | ^ti.slimeball
+root.image.item.mob_drops = ^ti.leather | ^ti.blaze* | ^ti.bone | ^ti.feather | ^ti.ender_pearl | ^ti.ender_eye | ^ti.ghast_tear | ^ti.gunpowder | ^ti.magma_cream | ^ti.nether_star | ^ti.rotten_flesh | ^ti.spider_eye* | ^ti.string | ^ti.slimeball | ^ti.shulker_shell
 root.image.item.crops.fish = ^ti.fish*
 root.image.item.crops.meat = ^ti.beef* | ^ti.chicken* | ^ti.porkchop* | ^ti.mutton*
 root.image.item.crops.seeds = ^ti.seeds*
@@ -177,13 +177,14 @@ root.image.item.tools.set_wood = ^ti.wood_axe | ^ti.wood_hoe | ^ti.wood_pickaxe
 root.image.item.tools.set_stone = ^ti.stone_axe | ^ti.stone_hoe | ^ti.stone_pickaxe | ^ti.stone_shovel | ^ti.stone_sword
 root.image.item.tools.buckets = ^ti.bucket_*
 root.image.item.tools.archery = ^ti.quiver | ^ti.arrow | ^ti.spectral_arrow | ^ti.tipped_arrow* | ^ti.bow_*
-root.image.item.tools = ^ti.shears | ^ti.fishing_rod* | ^ti.flint_and_steel
+root.image.item.tools.elytra = ^ti.elytra | ^ti.broken_elytra
+root.image.item.tools = ^ti.shears | ^ti.fishing_rod* | ^ti.flint_and_steel | ^ti.snowball
 root.image.item.minecarts = ^ti.minecart_*
 root.image.item.fireworks = ^ti.fireball | ^ti.fireworks*
 root.image.item.skulls = ^ti.skull_*
-root.image.item.books = ^ti.book_* | ^ti.paper | ^ti.map_*
+root.image.item.books = ^ti.book_* | ^ti.paper | ^ti.map_* | ^ti.knowledge_book
 root.image.item.bricks = ^ti.clay_ball | ^ti.brick | ^ti.netherbrick | ^ti.flower_pot
-root.image.item.technical = ^ti.barrier | ^ti.spawn_egg* | ^ti.empty_armor_slot_shield
+root.image.item.technical = ^ti.barrier | ^ti.spawn_egg* | ^ti.empty_armor_slot_shield | ^ti.structure_void
 root.image.item = ^ti.*
 
 root.image.particle = ^t.particle.* | ^te.explosion | ^te.sweep | ^te.experience_orb
@@ -201,6 +202,7 @@ root.image.gui.title = ^t.gui.title.*
 root.image.gui.map = ^t.map.*
 root.image.gui.presets = ^t.gui.presets.*
 root.image.gui.widgets = ^t.gui.widgets | ^t.gui.stream_indicator | ^t.gui.spectator_widgets | ^t.gui.server_selection | ^t.gui.resource_packs | ^t.gui.icons | ^t.gui.bars | ^t.gui.world_selection
+root.image.gui.advancement = ^t.gui.advancement*
 root.image.gui = ^t.gui.* | ^t.misc.unknown_pack | ^t.misc.unknown_server
 root.image.vision = ^t.misc.vignette | ^t.misc.underwater | ^t.misc.pumpkinblur
 root.image.misc = ^t.misc.* | ^t.painting.* | ^t.effect.*
@@ -213,7 +215,7 @@ root.image.block.redstone.machines.piston = ^tb.piston_*
 root.image.block.redstone.circuitry = ^tb.comparator_* | ^tb.daylight_detector_* | ^tb.lever | ^tb.redstone_torch_* | ^tb.repeater_* | ^tb.trip_wire*
 root.image.block.redstone.command = ^tb.*command_block*
 root.image.block.redstone = NULL
-root.image.block.technical = ^tb.debug | ^tb.structure_block*
+root.image.block.technical = ^tb.debug* | ^tb.structure_block* | ^tb.observer_*
 root.image.block.utility.chest = ^te.chest.*
 root.image.block.utility.bed = ^tb.bed_*
 root.image.block.utility.enchant = ^tb.enchanting_table_* | ^te.enchanting_table_book
@@ -231,11 +233,11 @@ root.image.block.wood.doors = ^tb.door_* | ^tb.trapdoor
 root.image.block.wood.planks = ^tb.planks_*
 root.image.block.glass.panes = ^tb.glass_pane_*
 root.image.block.glass = ^tb.glass | ^tb.glass_*
-root.image.block.liquids = ^tb.fire_* | ^tb.lava_* | ^tb.water_* | ^tb.ice  | ^tb.ice_*
+root.image.block.liquids = ^tb.fire_* | ^tb.lava_* | ^tb.water_* | ^tb.ice  | ^tb.ice_* | ^tb.frosted_ice_* | ^tb.snow
 root.image.block.minerals.cubes = ^tb.*_block
 root.image.block.minerals.ores = ^tb.*_ore
 root.image.block.minerals = NULL
-root.image.block.bio = ^tb.slime | ^tb.dragon_egg | ^tb.web | ^tb.sponge*
+root.image.block.bio = ^tb.slime | ^tb.dragon_egg | ^tb.web | ^tb.sponge* | ^tb.bone_block_*
 root.image.block.plants.double = ^tb.double_plant_*
 root.image.block.plants.saplings = ^tb.sapling_*
 root.image.block.plants.mushrooms = ^tb.mushroom_*
@@ -255,7 +257,13 @@ root.image.block.crops.wheat = ^tb.wheat_* | ^tb.hay_block_*
 root.image.block.crops = NULL
 root.image.block.portal = ^tb.endframe_* | ^tb.portal
 root.image.block.rails = ^tb.rail_*
-root.image.block.clay = ^tb.clay | ^tb.hardened_clay*
+root.image.block.concrete = NULL
+root.image.block.concrete.powder = ^tb.concrete_powder_*
+root.image.block.concrete.block = ^tb.concrete_*
+root.image.block.terracotta = NULL
+root.image.block.terracotta.glazed = ^tb.glazed_terracotta_*
+root.image.block.terracotta.raw = ^tb.clay | ^tb.hardened_clay*
+root.image.block.shulkerbox = ^tb.shulker_top_*
 root.image.block.wool = ^tb.wool_*
 root.image.block.dirt = ^tb.red_sand | ^tb.sand | ^tb.sand_* | ^tb.gravel | ^tb.soul_sand | ^tb.dirt | ^tb.dirt_* | ^tb.grass_* | ^tb.mycelium_* | ^tb.farmland_* | ^tb.coarse_dirt
 root.image.block.rocks = ^tb.bedrock | ^tb.cobblestone* | ^tb.stone | ^tb.stone_andesite* | ^tb.stone_diorite* | ^tb.stone_granite* | ^tb.obsidian
@@ -264,14 +272,16 @@ root.image.block.rocks.brick = ^tb.brick | ^tb.stone_slab_* | ^tb.stonebrick*
 root.image.block.rocks.purpur = ^tb.purpur_* | tb.purpur_block
 root.image.block.rocks.prismarine = ^tb.prismarine_*
 root.image.block.rocks.quartz = ^tb.quartz_block_*
-root.image.block.rocks.nether = ^tb.netherrack | ^tb.nether_brick
+root.image.block.rocks.nether = ^tb.netherrack | ^tb.nether_brick | ^tb.red_nether_brick | ^tb.magma
 root.image.block.rocks.end = ^tb.end_stone | ^tb.end_bricks
 root.image.block = ^tb.*
 
 # Entities
-root.image.entity.misc = ^te.endercrystal.* | ^te.boat | ^te.end_portal | ^te.lead_knot | ^te.minecart | ^te.sign
+root.image.entity.misc = ^te.endercrystal.* | ^te.end_portal | ^te.lead_knot | ^te.minecart | ^te.sign
 root.image.entity.beams =  ^te.beacon_beam | ^te.end_gateway_beam
-root.image.entity.armor = ^t.models.armor.*
+root.image.entity.boat = ^te.boat*
+root.image.entity.bed = ^te.bed*
+root.image.entity.armor = ^t.models.armor.* | ^te.elytra
 root.image.entity.arrows = ^te.projectiles.* | ^te.arrow
 root.image.entity.armorstand = ^te.armorstand.*
 root.image.entity.mob.cat = ^te.cat.*
@@ -282,22 +292,25 @@ root.image.entity.mob.enderman = ^te.enderman.*
 root.image.entity.mob.ghast = ^te.ghast.*
 root.image.entity.mob.horse.armor = ^te.horse.armor.*
 root.image.entity.mob.horse = ^te.horse.*
+root.image.entity.mob.parrot = ^te.parrot*
 root.image.entity.mob.pig = ^te.pig.*
 root.image.entity.mob.sheep = ^te.sheep.*
 root.image.entity.mob.rabbit = ^te.rabbit.*
 root.image.entity.mob.skeleton = ^te.skeleton.*
 root.image.entity.mob.slime = ^te.slime.*
 root.image.entity.mob.spider = ^te.spider.* | ^te.spider_eyes
+root.image.entity.mob.illager = ^te.illager*
+root.image.entity.mob.llama = ^te.decor_* | ^te.llama.*
 root.image.entity.mob.villager = ^te.villager.*
 root.image.entity.mob.wither = ^te.wither.*
 root.image.entity.mob.wolf = ^te.wolf.*
 root.image.entity.mob.zombie = ^te.zombie*
 root.image.entity.mob.guardian = ^te.guardian*
 root.image.entity.mob.shulker = ^te.shulker.*
-root.image.entity.mob = ^te.silverfish | ^te.bat | ^te.blaze | ^te.chicken | ^te.iron_golem | ^te.snowman | ^te.squid | ^te.witch | ^te.zombie_pigman | ^te.endermite
+root.image.entity.mob = ^te.silverfish | ^te.bat | ^te.blaze | ^te.chicken | ^te.iron_golem | ^te.snowman | ^te.squid | ^te.witch | ^te.zombie_pigman | ^te.endermite | ^te.bear*
 root.image.entity.player = ^te.steve | ^te.alex
 root.image.entity.banner = ^te.banner.* | ^te.banner_base
-root.image.entity.shield = ^te.shield.* | ^te.shield_base
+root.image.entity.shield = ^te.shield.* | ^te.shield_base | ^te.shield_base_nopattern
 root.image.entity = ^te.*
 
 # Image catch-all

resources/data/tree/groupsVanilla.ini

@@ -8,6 +8,13 @@ root.image = Textures
 
 # Blocks
 root.image.block = Blocks
+root.image.block.concrete = Concrete
+root.image.block.concrete.block = Block
+root.image.block.concrete.powder = Powder
+root.image.block.terracotta = Terracotta
+root.image.block.terracotta.glazed = Glazed
+root.image.block.terracotta.raw = Raw
+root.image.block.shulkerbox = Shulker Box
 root.image.block.technical = Technical
 root.image.block.bio = Biological
 root.image.block.utility = Utility Blocks
@@ -52,7 +59,6 @@ root.image.block.redstone.command = Command Blocks
 root.image.block.redstone.machines = Machines
 root.image.block.redstone.machines.piston = Piston
 root.image.block.redstone.circuitry = Circuitry
-root.image.block.clay = Clay
 root.image.block.rocks = Rocks
 root.image.block.rocks.sandstone = Sandstone
 root.image.block.rocks.nether = Netherrack
@@ -79,6 +85,7 @@ root.image.gui.presets = World Preset Previews
 root.image.gui.widgets = Widgets
 root.image.gui.title = Title Screen
 root.image.gui.title.background = Panorama
+root.image.gui.advancement = Advancement
 
 root.image.vision = Vision Filters
 root.image.misc = Misc
@@ -98,6 +105,7 @@ root.image.item.tools.clock = Clock
 root.image.item.tools.compass = Compass
 root.image.item.tools.archery = Archery
 root.image.item.tools.buckets = Buckets
+root.image.item.tools.elytra = Elytra
 root.image.item.doors = Doors & Wood
 root.image.item.boats = Boats
 root.image.item.banner = Banners
@@ -137,6 +145,8 @@ root.image.entity.banner = Banners
 root.image.entity.shield = Shields
 root.image.entity.player = Player
 root.image.entity.beams = Light Beams
+root.image.entity.bed = Bed
+root.image.entity.boat = Boat
 root.image.entity.mob = Mobs
 root.image.entity.mob.cat = Cat
 root.image.entity.mob.cow = Cow & Mooshroom
@@ -147,12 +157,15 @@ root.image.entity.mob.ghast = Ghast
 root.image.entity.mob.guardian = Guardian
 root.image.entity.mob.horse = Horse
 root.image.entity.mob.horse.armor = Horse Armour
+root.image.entity.mob.parrot = Parrot
 root.image.entity.mob.pig = Pig
 root.image.entity.mob.rabbit = Rabbit
 root.image.entity.mob.sheep = Sheep
 root.image.entity.mob.skeleton = Skeleton
 root.image.entity.mob.slime = Slime & Magma Cube
 root.image.entity.mob.spider = Spider
+root.image.entity.mob.illager = Illager
+root.image.entity.mob.llama = Llama
 root.image.entity.mob.villager = Villager
 root.image.entity.mob.wither = Wither
 root.image.entity.mob.wolf = Wolf

src/com/pixbits/rpw/stitcher/AssetImage.java

@@ -86,27 +86,19 @@ public void reset()
 	}
 
 
-	public void cacheImage(int w, int h) throws IOException
+	public void cacheImage(float w, float h) throws IOException
 	{
 		BufferedImage tmpImage = ImageIO.read(file);
 
 		if (tmpImage.getWidth() == w && tmpImage.getHeight() == h) image = tmpImage;
 		else {
-			image = new BufferedImage(w, h, tmpImage.getType());
+			image = new BufferedImage((int)(tmpImage.getWidth() * w), (int)(tmpImage.getHeight() * h), tmpImage.getType());
 			((Graphics2D) image.getGraphics()).setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_NEAREST_NEIGHBOR);
-			((Graphics2D) image.getGraphics()).drawImage(tmpImage, 0, 0, w, h, null);
+			((Graphics2D) image.getGraphics()).drawImage(tmpImage, 0, 0, (int)(tmpImage.getWidth() * w), (int)(tmpImage.getHeight() * h), null);
 		}
 
 		element.w = image.getWidth();
 		element.h = image.getHeight();
 	}
 
-
-	public void cacheImage() throws IOException
-	{
-		image = ImageIO.read(file);
-
-		element.w = image.getWidth();
-		element.h = image.getHeight();
-	}
-}
+}

src/com/pixbits/rpw/stitcher/AssetLayout.java

@@ -38,7 +38,7 @@ private void reset()
 
 	Point computeLayout()
 	{
-		int gw = 64, gh = 64;
+		int gw = 16, gh = 16;
 
 		while (!computeLayout(gw, gh)) {
 			if (gw > gh) gh *= 2;
@@ -125,4 +125,8 @@ Node insert(AssetImage asset)
 			}
 		}
 	}
-}
+
+	public Set<AssetImage> getEntries() {
+		return entries;
+	}
+}