diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..73538be6f --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +out/* +bin/* diff --git a/out/production/Terrarum_renewed/META-INF/Terrarum_renewed.kotlin_module b/out/production/Terrarum_renewed/META-INF/Terrarum_renewed.kotlin_module deleted file mode 100644 index ea5bb5077..000000000 Binary files a/out/production/Terrarum_renewed/META-INF/Terrarum_renewed.kotlin_module and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/CSVFetcher.class b/out/production/Terrarum_renewed/com/Torvald/CSVFetcher.class deleted file mode 100644 index bf4b8795f..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/CSVFetcher.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/ColourUtil/Col216.class b/out/production/Terrarum_renewed/com/Torvald/ColourUtil/Col216.class deleted file mode 100644 index 9e0e56d4c..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/ColourUtil/Col216.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/ColourUtil/Col40.class b/out/production/Terrarum_renewed/com/Torvald/ColourUtil/Col40.class deleted file mode 100644 index 4528063f6..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/ColourUtil/Col40.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/ColourUtil/Col4096.class b/out/production/Terrarum_renewed/com/Torvald/ColourUtil/Col4096.class deleted file mode 100644 index 16e3cb947..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/ColourUtil/Col4096.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/ColourUtil/HSV.class b/out/production/Terrarum_renewed/com/Torvald/ColourUtil/HSV.class deleted file mode 100644 index 8b4733e08..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/ColourUtil/HSV.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/ColourUtil/HSVUtil.class b/out/production/Terrarum_renewed/com/Torvald/ColourUtil/HSVUtil.class deleted file mode 100644 index 5010a249d..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/ColourUtil/HSVUtil.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/ColourUtil/LimitedColours.class b/out/production/Terrarum_renewed/com/Torvald/ColourUtil/LimitedColours.class deleted file mode 100644 index dacf0169e..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/ColourUtil/LimitedColours.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/ImageFont/GameFontBase.class b/out/production/Terrarum_renewed/com/Torvald/ImageFont/GameFontBase.class deleted file mode 100644 index 477342d27..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/ImageFont/GameFontBase.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/ImageFont/GameFontWhite.class b/out/production/Terrarum_renewed/com/Torvald/ImageFont/GameFontWhite.class deleted file mode 100644 index 1b31b99db..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/ImageFont/GameFontWhite.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/JsonFetcher.class b/out/production/Terrarum_renewed/com/Torvald/JsonFetcher.class deleted file mode 100644 index cdabb7395..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/JsonFetcher.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/JsonWriter.class b/out/production/Terrarum_renewed/com/Torvald/JsonWriter.class deleted file mode 100644 index d2fbb6816..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/JsonWriter.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Point/Point2f.class b/out/production/Terrarum_renewed/com/Torvald/Point/Point2f.class deleted file mode 100644 index 4f6737644..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Point/Point2f.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Rand/Fudge3.class b/out/production/Terrarum_renewed/com/Torvald/Rand/Fudge3.class deleted file mode 100644 index 7b777eca2..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Rand/Fudge3.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Rand/FudgeDice.class b/out/production/Terrarum_renewed/com/Torvald/Rand/FudgeDice.class deleted file mode 100644 index 01fa627d1..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Rand/FudgeDice.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Rand/HQRNG.class b/out/production/Terrarum_renewed/com/Torvald/Rand/HQRNG.class deleted file mode 100644 index 8b8e124b6..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Rand/HQRNG.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Rand/MTRandom.class b/out/production/Terrarum_renewed/com/Torvald/Rand/MTRandom.class deleted file mode 100644 index 2eb97fdea..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Rand/MTRandom.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/RasterWriter.class b/out/production/Terrarum_renewed/com/Torvald/RasterWriter.class deleted file mode 100644 index f52f52911..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/RasterWriter.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ABOUT b/out/production/Terrarum_renewed/com/Torvald/Terrarum/ABOUT deleted file mode 100644 index 5b11390bc..000000000 --- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ABOUT +++ /dev/null @@ -1,130 +0,0 @@ - -== CHALLENGING, NOT PUNISHING == https://www.youtube.com/watch?v=ea6UuRTjkKs - - 1. CONSISTENT RULES - - No arbitrary unstoppable death - - 2. Player's skill involved - - Can play around, not restart - - 3. Usability of in-game tools - - Players should be able to 'regret' their strategy and adjust. - - 4. Comfortable control - - 5. Make players overcome the challenge, not defeating them - - 6. Let players have "aha" moment when they failed. - - Make them hungry to retry with new strategies. - - Some small things they've could done differently - - e.g. "One-big-hit didn't worked, may I should've picked up high DPS one" - - -== MORE DEPTH, LESS COMPLEXITY == https://www.youtube.com/watch?v=jVL4st0blGU - - 1. Memorise less! - - Less burden to, even starting the game - - Start with gentle learning curve, getting slowly steep - - Intuitive UX (UI, control, ...) - - Good tutorial = lessens complexity - - 2. Intuitive! - - 3. Calculations per second - - reduce! - - 4. Players have to know everything to even begin the play == FAIL (irreducible complexity) - - Make them get familiar with rules of the game - - Dwarf Fortress failed this! - - -== Lots of things players can play with (aka don't make them bored) == - - - Combat, battle, building, mechanics, adventure, dungeon explore, spelunking - - Not scaled; easy combat, tough combat, tedious combat, etc. - - -== Achieving perfect imbalance == https://www.youtube.com/watch?v=e31OSVZF77w - - - Make sure no matter how you skilled, your playable character cannot be good at everything - - Give players __wide pool of options__ to solve problem - (kill the boss, defend their adobe, fast transportation, etc.) - - --=*## What feeling do you want to convey? ##*=- - - -== Always think WHY you want to add _something_ on the game == - - - e.g. Why are you adding RPG leveling system? What it would do to the players? How would they play with? - - - -See also: HEARTS, CLUBS, DIAMONDS, SPADES: PLAYERS WHO SUIT MUDS - - -==================================== - - -== Friendlier version of Dwarf Fortress Adventure mode == - - - Yet _lots of fun_ - - Add Fortress mode features by 'make your own settling' - - Hard to actually die, but once you die, you're done. - + Config: imtooyoungtodie for easy mode - - - Genre: Adventure, Open world (towns in RPG, building, town managing (conquer existing one or - you build one and persuade existing people to move in) -> See Dwarf Fortress and Animal Crossing) - - * Adventure: adventure this vast—5,5 km wide—world, discover new (and good/horrible) things - - * Open world: - - Building: building your own houses, structures, etc. - - Town managing: - 1. Build your own little hamlet and manage it - or- - 2. Conquer existing one and become a ruler - The town is a special hamlet that can be tailored for your taste - - Survival: - mobs will trying to attack your assets (yourself, your hamlet, your people) - - - -== Side view == - -== Interact menu w/ mouse right == - -== Pixelated sprites == - - Use 2x sprites if rotating does not work well - - -== User experience == - - * Indicative mouse cursor - - -== Game mechanics == - - * 24 pixels == 1 metre - - -== Purpose of the game == - - * Boss - - Will be mentioned/shown as absolute _evil_. - - But actually is not. - - * Theme - - Is an evil really really is what we think? - - Is there a thing as 'absolute evil'? - - * Boss character - - From debugger character - - Name key: "Sigriðr hinn Dróttningin" (can be changed) - * Little setting - - A ruler, hated by people - - * Mechanics - - Beating boss does not ends the game, but grants an ability to - create new character as it. - \ No newline at end of file diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/AI/ActorAI.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/AI/ActorAI.class deleted file mode 100644 index ca14c10e3..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/AI/ActorAI.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/AIControlled.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/AIControlled.class deleted file mode 100644 index a41c1a6d6..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/AIControlled.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Actor b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Actor deleted file mode 100644 index 54a60be02..000000000 --- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Actor +++ /dev/null @@ -1,18 +0,0 @@ -package com.Torvald.Terrarum.Actors; - -import org.newdawn.slick.GameContainer; -import org.newdawn.slick.Graphics; - -/** - * Created by minjaesong on 15-12-31. - */ -public interface Actor { - - void update(GameContainer gc, int delta_t); - - /** - * Valid RefID is equal to or greater than 32768. - * @return Reference ID. (32768-0x7FFF_FFFF_FFFF_FFFF) - */ - long getRefID(); -} diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Actor.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Actor.class deleted file mode 100644 index 73d40d410..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Actor.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/ActorInventory.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/ActorInventory.class deleted file mode 100644 index 4b0d9230b..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/ActorInventory.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/ActorValue.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/ActorValue.class deleted file mode 100644 index fc6d024cb..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/ActorValue.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/ActorWithBody b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/ActorWithBody deleted file mode 100644 index c9e1cb980..000000000 --- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/ActorWithBody +++ /dev/null @@ -1,1002 +0,0 @@ -package com.Torvald.Terrarum.Actors; - -import com.Torvald.Rand.HQRNG; -import com.Torvald.Terrarum.*; -import com.Torvald.Terrarum.GameMap.GameMap; -import com.Torvald.Terrarum.MapDrawer.MapDrawer; -import com.Torvald.Terrarum.NotNull; -import com.Torvald.Terrarum.Nullable; -import com.Torvald.Terrarum.TileProperties.TilePropCodex; -import com.Torvald.spriteAnimation.SpriteAnimation; -import com.jme3.math.FastMath; -import org.newdawn.slick.GameContainer; -import org.newdawn.slick.Graphics; - -/** - * Created by minjaesong on 16-01-13. - */ -public class ActorWithBody implements Actor, Visible, Glowing { - - ActorValue actorValue; - - ActorInventory inventory; - - private @NotNull float hitboxTranslateX; // relative to spritePosX - private @NotNull float hitboxTranslateY; // relative to spritePosY - private @NotNull int baseHitboxW; - private @NotNull int baseHitboxH; - - /** - * Velocity for newtonian sim. - * Fluctuation in, otherwise still, velocity is equal to acceleration. - * - * Acceleration: used in code like: - * veloY += 3.0 - * +3.0 is acceleration. You __accumulate__ acceleration to the velocity. - */ - private volatile @NotNull float veloX, veloY; - private transient final float VELO_HARD_LIMIT = 10000; - - boolean grounded = false; - - transient @Nullable SpriteAnimation sprite; - transient @Nullable SpriteAnimation spriteGlow; - /** Default to 'false' */ - private boolean visible = false; - /** Default to 'true' */ - private boolean update = true; - - private boolean noSubjectToGrav = false; - private boolean noCollideWorld = false; - private boolean noSubjectToFluidResistance = false; - - int baseSpriteWidth, baseSpriteHeight; - - /** - * Positions: top-left point - */ - private volatile @NotNull Hitbox hitbox; - private volatile transient @NotNull Hitbox nextHitbox; - - /** - * Physical properties - */ - private volatile transient @NonZero float scale = 1; - private volatile transient @NonZero float mass = 2f; - private transient final float MASS_LOWEST = 2f; - /** Valid range: [0, 1] */ - private float elasticity = 0; - private transient final float ELASTICITY_MAX = 0.993f; - private @NoNegative float density = 1000; - - private static transient final int TSIZE = MapDrawer.TILE_SIZE; - private static int AUTO_CLIMB_RATE = TSIZE / 8; - - /** - * Gravitational Constant G. Load from GameMap. - * [m / s^2] - * s^2 = 1/FPS = 1/60 if FPS is targeted to 60 - * meter to pixel : 24/FPS - */ - private transient final float METER = 24f; - /** - * [m / s^2] * SI_TO_GAME_ACC -> [px / IFrame^2] - */ - private transient final float SI_TO_GAME_ACC = METER / FastMath.sqr(Terrarum.TARGET_FPS); - /** - * [m / s] * SI_TO_GAME_VEL -> [px / IFrame] - */ - private transient final float SI_TO_GAME_VEL = METER / Terrarum.TARGET_FPS; - - private transient float gravitation; - private transient final float DRAG_COEFF = 1f; - - private transient final int CONTACT_AREA_TOP = 0; - private transient final int CONTACT_AREA_RIGHT = 1; - private transient final int CONTACT_AREA_BOTTOM = 2; - private transient final int CONTACT_AREA_LEFT = 3; - - private transient final int UD_COMPENSATOR_MAX = TSIZE; - private transient final int LR_COMPENSATOR_MAX = TSIZE; - private transient final int TILE_AUTOCLIMB_RATE = 4; - - /** - * A constant to make falling faster so that the game is more playable - */ - private transient final float G_MUL_PLAYABLE_CONST = 1.4142f; - - long referenceID; - - private transient final int EVENT_MOVE_TOP = 0; - private transient final int EVENT_MOVE_RIGHT = 1; - private transient final int EVENT_MOVE_BOTTOM = 2; - private transient final int EVENT_MOVE_LEFT = 3; - private transient final int EVENT_MOVE_NONE = -1; - - transient int eventMoving = EVENT_MOVE_NONE; // cannot collide both X-axis and Y-axis, or else jump control breaks up. - - /** - * in milliseconds - */ - public transient final int INVINCIBILITY_TIME = 500; - - /** - * Will ignore fluid resistance if (submerged height / actor height) <= this var - */ - private transient final float FLUID_RESISTANCE_IGNORE_THRESHOLD_RATIO = 0.2f; - private transient final float FLUID_RESISTANCE_APPLY_FULL_RATIO = 0.5f; - - private transient GameMap map; - - /** - * Give new random ReferenceID and initialise ActorValue - */ - public ActorWithBody() { - referenceID = new HQRNG().nextLong(); - actorValue = new ActorValue(); - map = Terrarum.game.map; - } - - /** - * - * @param w - * @param h - * @param tx +: translate drawn sprite to LEFT. - * @param ty +: translate drawn sprite to DOWN. - * @see ActorWithBody#drawBody(GameContainer, Graphics) - * @see ActorWithBody#drawGlow(GameContainer, Graphics) - */ - public void setHitboxDimension(int w, int h, int tx, int ty) { - baseHitboxH = h; - baseHitboxW = w; - hitboxTranslateX = tx; - hitboxTranslateY = ty; - } - - /** - * Set hitbox position from bottom-center point - * @param x - * @param y - */ - public void setPosition(float x, float y) { - hitbox = new Hitbox( - x - ((baseHitboxW / 2) - hitboxTranslateX) * scale - , y - (baseHitboxH - hitboxTranslateY) * scale - , baseHitboxW * scale - , baseHitboxH * scale - ); - - nextHitbox = new Hitbox( - x - ((baseHitboxW / 2) - hitboxTranslateX) * scale - , y - (baseHitboxH - hitboxTranslateY) * scale - , baseHitboxW * scale - , baseHitboxH * scale - ); - } - - public void setSprite(SpriteAnimation sprite) {this.sprite = sprite; } - - public void setSpriteGlow(SpriteAnimation sprite) { this.spriteGlow = sprite; } - - public void update(GameContainer gc, int delta_t) { - if (update) { - /** - * Update variables - */ - if (this instanceof Player) { - noSubjectToGrav = isPlayerNoClip(); - noCollideWorld = isPlayerNoClip(); - noSubjectToFluidResistance = isPlayerNoClip(); - } - - if (mass < MASS_LOWEST) mass = MASS_LOWEST; // clamp to minimum possible mass - if (sprite != null) { - baseSpriteHeight = sprite.getHeight(); - baseSpriteWidth = sprite.getWidth(); - } - gravitation = map.getGravitation(); - AUTO_CLIMB_RATE = (int) Math.min(TSIZE / 8 * FastMath.sqrt(scale), TSIZE); - - if (!isNoSubjectToGrav()) { - applyGravitation(); - applyBuoyancy(); - } - - // hard limit velocity - if (veloX > VELO_HARD_LIMIT) veloX = VELO_HARD_LIMIT; - if (veloY > VELO_HARD_LIMIT) veloY = VELO_HARD_LIMIT; - // limit velocity by fluid resistance - //int tilePropResistance = getTileMvmtRstc(); - //if (!noSubjectToFluidResistance) { - // veloX *= mvmtRstcToMultiplier(tilePropResistance); - // veloY *= mvmtRstcToMultiplier(tilePropResistance); - //} - - - // Set 'next' positions to fiddle with - updateNextHitboxFromVelo(); - - - // if not horizontally moving then ... - //if (Math.abs(veloX) < 0.5) { // fix for special situations (see fig. 1 at the bottom of the source) - // updateVerticalPos(); - // updateHorizontalPos(); - //} - //else { - updateHorizontalPos(); - updateVerticalPos(); - //} - - - updateHitboxX(); - updateHitboxY(); - - - clampNextHitbox(); - clampHitbox(); - } - } - - /** - * Apply gravitation to the every falling body (unless not levitating) - * - * Apply only if not grounded; normal force is not implemented (and redundant) - * so we manually reset G to zero (not applying G. force) if grounded. - */ - // FIXME abnormal jump behaviour if mass < 2, same thing happens if mass == 0 (but zero mass is invalid anyway). - private void applyGravitation() { - if (!getGrounded()) { - /** - * weight; gravitational force in action - * W = mass * G (9.8 [m/s^2]) - */ - float W = gravitation * mass; - /** - * Drag of atmosphere - * D = Cd (drag coefficient) * 0.5 * rho (density) * V^2 (velocity) * A (area) - */ - float A = scale * scale; - float D = DRAG_COEFF * 0.5f * 1.292f * veloY * veloY * A; - - int fluidResistance = getTileMvmtRstc(); - - veloY += clampCeil( - ((W - D) / mass) * SI_TO_GAME_ACC * G_MUL_PLAYABLE_CONST - // * mvmtRstcToMultiplier(fluidResistance) // eliminate shoot-up from fluids - , VELO_HARD_LIMIT - ); - } - } - - private void updateVerticalPos() { - if (!isNoCollideWorld()) { - // check downward - if (veloY >= 0) { - // order of the if-elseif chain is IMPORTANT - if (isColliding(CONTACT_AREA_BOTTOM)) { - adjustHitBottom(); - elasticReflectY(); - grounded = true; - } - else if (isColliding(CONTACT_AREA_BOTTOM, 0, 1)) { - elasticReflectY(); - grounded = true; - } - else { - grounded = false; - } - } - else if (veloY < 0) { - grounded = false; - - // order of the if-elseif chain is IMPORTANT - if (isColliding(CONTACT_AREA_TOP)) { - adjustHitTop(); - elasticReflectY(); - } - else if (isColliding(CONTACT_AREA_TOP, 0, -1)) { - elasticReflectY(); // for reversed gravity - } - else { - } - } - } - } - - private void adjustHitBottom() { - float newX = nextHitbox.getPointedX(); // look carefully, getPos or getPointed - // int-ify posY of nextHitbox - nextHitbox.setPositionYFromPoint( FastMath.floor(nextHitbox.getPointedY()) ); - - int newYOff = 0; // always positive - - boolean colliding; - do { - newYOff += 1; - colliding = isColliding(CONTACT_AREA_BOTTOM, 0, -newYOff); - } while (colliding); - - float newY = nextHitbox.getPointedY() - newYOff; - nextHitbox.setPositionFromPoint(newX, newY); - } - - private void adjustHitTop() { - float newX = nextHitbox.getPosX(); - // int-ify posY of nextHitbox - nextHitbox.setPositionY( FastMath.ceil(nextHitbox.getPosY()) ); - - int newYOff = 0; // always positive - - boolean colliding; - do { - newYOff += 1; - colliding = isColliding(CONTACT_AREA_TOP, 0, newYOff); - } while (colliding); - - float newY = nextHitbox.getPosY() + newYOff; - nextHitbox.setPosition(newX, newY); - } - - private void updateHorizontalPos() { - if (!isNoCollideWorld()) { - // check right - if (veloX >= 0.5) { - // order of the if-elseif chain is IMPORTANT - if (isColliding(CONTACT_AREA_RIGHT) && !isColliding(CONTACT_AREA_LEFT)) { - adjustHitRight(); - elasticReflectX(); - } - else if (isColliding(CONTACT_AREA_RIGHT, 1, 0) - && !isColliding(CONTACT_AREA_LEFT, -1, 0)) { - elasticReflectX(); - } - else { - } - } - else if (veloX <= -0.5) { - // System.out.println("collidingleft"); - // order of the if-elseif chain is IMPORTANT - if (isColliding(CONTACT_AREA_LEFT) && !isColliding(CONTACT_AREA_RIGHT)) { - adjustHitLeft(); - elasticReflectX(); - } - else if (isColliding(CONTACT_AREA_LEFT, -1, 0) - && !isColliding(CONTACT_AREA_RIGHT, 1, 0)) { - elasticReflectX(); - } - else { - } - } - else { - // System.out.println("updatehorizontal - |velo| < 0.5"); - if (isColliding(CONTACT_AREA_LEFT) || isColliding(CONTACT_AREA_RIGHT)) { - elasticReflectX(); - } - } - } - } - - private void adjustHitRight() { - float newY = nextHitbox.getPosY(); // look carefully, getPos or getPointed - // int-ify posY of nextHitbox - nextHitbox.setPositionX( FastMath.floor(nextHitbox.getPosX() + nextHitbox.getWidth()) - - nextHitbox.getWidth() - ); - - int newXOff = 0; // always positive - - boolean colliding; - do { - newXOff += 1; - colliding = isColliding(CONTACT_AREA_BOTTOM, -newXOff, 0); - } while (newXOff < TSIZE && colliding); - - float newX = nextHitbox.getPosX() - newXOff; - nextHitbox.setPosition(newX, newY); - } - - private void adjustHitLeft() { - float newY = nextHitbox.getPosY(); - // int-ify posY of nextHitbox - nextHitbox.setPositionX( FastMath.ceil(nextHitbox.getPosX()) ); - - int newXOff = 0; // always positive - - boolean colliding; - do { - newXOff += 1; - colliding = isColliding(CONTACT_AREA_TOP, newXOff, 0); - } while (newXOff < TSIZE && colliding); - - float newX = nextHitbox.getPosX() + newXOff; - nextHitbox.setPosition(newX, newY); // + 1; float-point rounding compensation (i think...) - } - - private void elasticReflectX() { - if (veloX != 0) veloX = -veloX * elasticity; - } - - private void elasticReflectY() { - if (veloY != 0) veloY = -veloY * elasticity; - } - - private boolean isColliding(int side) { - return isColliding(side, 0, 0); - } - - private boolean isColliding(int side, int tx, int ty) { - return getContactingArea(side, tx, ty) > 1; - } - - private int getContactingArea(int side) { - return getContactingArea(side, 0, 0); - } - - private int getContactingArea(int side, int translateX, int translateY) { - int contactAreaCounter = 0; - for (int i = 0 - ; i < Math.round((side % 2 == 0) ? nextHitbox.getWidth() : nextHitbox.getHeight()) - ; i++) { - // set tile positions - int tileX, tileY; - /*if (side == CONTACT_AREA_BOTTOM) { - tileX = div16TruncateToMapWidth(Math.round(nextHitbox.getHitboxStart().getX()) - + i + translateX); - tileY = div16TruncateToMapHeight(FastMath.floor(nextHitbox.getHitboxEnd().getY()) - + translateY); - } - else if (side == CONTACT_AREA_TOP) { - tileX = div16TruncateToMapWidth(Math.round(nextHitbox.getHitboxStart().getX()) - + i + translateX); - tileY = div16TruncateToMapHeight(FastMath.ceil(nextHitbox.getHitboxStart().getY()) - + translateY); - } - else if (side == CONTACT_AREA_RIGHT) { - tileX = div16TruncateToMapWidth(FastMath.floor(nextHitbox.getHitboxEnd().getX()) - + translateX); - tileY = div16TruncateToMapHeight(Math.round(nextHitbox.getHitboxStart().getY()) - + i + translateY); - } - else if (side == CONTACT_AREA_LEFT) { - tileX = div16TruncateToMapWidth(FastMath.ceil(nextHitbox.getHitboxStart().getX()) - + translateX); - tileY = div16TruncateToMapHeight(Math.round(nextHitbox.getHitboxStart().getY()) - + i + translateY); - }*/ - if (side == CONTACT_AREA_BOTTOM) { - tileX = div16TruncateToMapWidth(Math.round(nextHitbox.getHitboxStart().getX()) - + i + translateX); - tileY = div16TruncateToMapHeight(Math.round(nextHitbox.getHitboxEnd().getY()) - + translateY); - } - else if (side == CONTACT_AREA_TOP) { - tileX = div16TruncateToMapWidth(Math.round(nextHitbox.getHitboxStart().getX()) - + i + translateX); - tileY = div16TruncateToMapHeight(Math.round(nextHitbox.getHitboxStart().getY()) - + translateY); - } - else if (side == CONTACT_AREA_RIGHT) { - tileX = div16TruncateToMapWidth(Math.round(nextHitbox.getHitboxEnd().getX()) - + translateX); - tileY = div16TruncateToMapHeight(Math.round(nextHitbox.getHitboxStart().getY()) - + i + translateY); - } - else if (side == CONTACT_AREA_LEFT) { - tileX = div16TruncateToMapWidth(Math.round(nextHitbox.getHitboxStart().getX()) - + translateX); - tileY = div16TruncateToMapHeight(Math.round(nextHitbox.getHitboxStart().getY()) - + i + translateY); - } - else { - throw new IllegalArgumentException(String.valueOf(side) + ": Wrong side input"); - } - - // evaluate - if (TilePropCodex.getProp(map.getTileFromTerrain(tileX, tileY)).isSolid()) { - contactAreaCounter += 1; - } - } - - return contactAreaCounter; - } - - /** - * [N] = [kg * m / s^2] - * F(bo) = density * submerged_volume * gravitational_acceleration [N] - */ - private void applyBuoyancy() { - int fluidDensity = getTileDensity(); - float submergedVolume = getSubmergedVolume(); - - if (!isPlayerNoClip() && !grounded) { - // System.out.println("density: "+density); - veloY -= ((fluidDensity - this.density) - * map.getGravitation() * submergedVolume - * Math.pow(mass, -1) - * SI_TO_GAME_ACC); - } - } - - private float getSubmergedVolume() { - float GAME_TO_SI_VOL = FastMath.pow((1f/METER), 3); - - if( density > 0 ){ - return getSubmergedHeight() - * nextHitbox.getWidth() * nextHitbox.getWidth() - * GAME_TO_SI_VOL - ; - //System.out.println("fluidHeight: "+fluidHeight+", submerged: "+submergedVolume); - //submergedHeight / TILE_SIZE * 1^2 (pixel to meter) - } - else{ - return 0; - } - } - - private float getSubmergedHeight() { - return FastMath.clamp( - nextHitbox.getPointedY() - getFluidLevel() - , 0 - , nextHitbox.getHeight() - ); - } - - private int getFluidLevel() { - int tilePosXStart = Math.round(nextHitbox.getPosX() / TSIZE); - int tilePosXEnd = Math.round(nextHitbox.getHitboxEnd().getX() / TSIZE); - int tilePosY = Math.round(nextHitbox.getPosY() / TSIZE); - - int fluidHeight = 2147483647; - - for (int x = tilePosXStart; x <= tilePosXEnd; x++) { - int tile = map.getTileFromTerrain(x, tilePosY); - if ( TilePropCodex.getProp(tile).isFluid() - && tilePosY * TSIZE < fluidHeight ){ - fluidHeight = tilePosY * TSIZE; - } - } - - return fluidHeight; - } - - /** - * Get highest friction value from feet tiles. - * @return - */ - private int getTileFriction(){ - int friction = 0; - - int tilePosXStart = Math.round(nextHitbox.getPosX() / TSIZE); - int tilePosXEnd = Math.round(nextHitbox.getHitboxEnd().getX() / TSIZE); - int tilePosY = Math.round(nextHitbox.getPointedY() / TSIZE); - - //get density - for (int x = tilePosXStart; x <= tilePosXEnd; x++) { - int tile = map.getTileFromTerrain(x, tilePosY); - if (TilePropCodex.getProp(tile).isFluid()) { - int thisFluidDensity = TilePropCodex.getProp(tile).getFriction(); - - if (thisFluidDensity > friction) friction = thisFluidDensity; - } - } - - return friction; - } - - /** - * Get highest movement resistance value from tiles that the body occupies. - * @return - */ - private int getTileMvmtRstc(){ - int resistance = 0; - - int tilePosXStart = Math.round(nextHitbox.getPosX() / TSIZE); - int tilePosYStart = Math.round(nextHitbox.getPosY() / TSIZE); - int tilePosXEnd = Math.round(nextHitbox.getHitboxEnd().getX() / TSIZE); - int tilePosYEnd = Math.round(nextHitbox.getHitboxEnd().getY() / TSIZE); - - //get density - for (int y = tilePosYStart; y <= tilePosYEnd; y++) { - for (int x = tilePosXStart; x <= tilePosXEnd; x++) { - int tile = map.getTileFromTerrain(x, y); - if (TilePropCodex.getProp(tile).isFluid()) { - int thisFluidDensity = TilePropCodex.getProp(tile).getMovementResistance(); - - if (thisFluidDensity > resistance) resistance = thisFluidDensity; - } - } - } - - return resistance; - } - - /** - * Get highest density (specific gravity) value from tiles that the body occupies. - * @return - */ - private int getTileDensity() { - int density = 0; - - int tilePosXStart = Math.round(nextHitbox.getPosX() / TSIZE); - int tilePosYStart = Math.round(nextHitbox.getPosY() / TSIZE); - int tilePosXEnd = Math.round(nextHitbox.getHitboxEnd().getX() / TSIZE); - int tilePosYEnd = Math.round(nextHitbox.getHitboxEnd().getY() / TSIZE); - - //get density - for (int y = tilePosYStart; y <= tilePosYEnd; y++) { - for (int x = tilePosXStart; x <= tilePosXEnd; x++) { - int tile = map.getTileFromTerrain(x, y); - if (TilePropCodex.getProp(tile).isFluid()) { - int thisFluidDensity = TilePropCodex.getProp(tile).getDensity(); - - if (thisFluidDensity > density) density = thisFluidDensity; - } - } - } - - return density; - } - - private float mvmtRstcToMultiplier(int movementResistanceValue) { - return 1f / (1 + (movementResistanceValue / 16f)); - } - - private void clampHitbox() { - hitbox.setPositionFromPoint( - clampW(hitbox.getPointedX()) - , clampH(hitbox.getPointedY()) - ); - } - - private void clampNextHitbox() { - nextHitbox.setPositionFromPoint( - clampW(nextHitbox.getPointedX()) - , clampH(nextHitbox.getPointedY()) - ); - } - - private void updateNextHitboxFromVelo() { - float fluidResistance = mvmtRstcToMultiplier(getTileMvmtRstc()); - float submergedRatio = FastMath.clamp( - getSubmergedHeight() / nextHitbox.getHeight() - , 0f, 1f - ); - - boolean applyResistance = (!isNoSubjectToFluidResistance() - && submergedRatio > FLUID_RESISTANCE_IGNORE_THRESHOLD_RATIO - ); - float resistanceMulInterValueSize = FLUID_RESISTANCE_APPLY_FULL_RATIO - FLUID_RESISTANCE_IGNORE_THRESHOLD_RATIO; - float resistanceMultiplier = FastMath.interpolateLinear( - (submergedRatio - FLUID_RESISTANCE_IGNORE_THRESHOLD_RATIO) - * FastMath.pow(resistanceMulInterValueSize, -1) - , 0, 1 - ); - float adjustedResistance = FastMath.interpolateLinear( - resistanceMultiplier - , 1f, fluidResistance - ); - - nextHitbox.set( - Math.round(hitbox.getPosX() - + (veloX - * (!applyResistance ? 1 : adjustedResistance) - )) - , Math.round(hitbox.getPosY() - + (veloY - * (!applyResistance ? 1 : adjustedResistance) - )) - , Math.round(baseHitboxW * scale) - , Math.round(baseHitboxH * scale) - /** Full quantisation; wonder what havoc these statements would wreak... - */ - ); - } - - private void updateHitboxX() { - hitbox.setDimension( - nextHitbox.getWidth() - , nextHitbox.getHeight() - ); - hitbox.setPositionX(nextHitbox.getPosX()); - } - - private void updateHitboxY() { - hitbox.setDimension( - nextHitbox.getWidth() - , nextHitbox.getHeight() - ); - hitbox.setPositionY(nextHitbox.getPosY()); - } - - @Override - public void drawGlow(GameContainer gc, Graphics g) { - if (visible && spriteGlow != null) { - if (!sprite.flippedHorizontal()) { - spriteGlow.render(g - , (hitbox.getPosX() - (hitboxTranslateX * scale)) - , (hitbox.getPosY() + (hitboxTranslateY * scale)) - - (baseSpriteHeight - baseHitboxH) * scale - + 2 - , scale - ); - } - else { - spriteGlow.render(g - , (hitbox.getPosX() - scale) - , (hitbox.getPosY() + (hitboxTranslateY * scale)) - - (baseSpriteHeight - baseHitboxH) * scale - + 2 - , scale - ); - } - } - } - - @Override - public void drawBody(GameContainer gc, Graphics g) { - if (visible && sprite != null) { - if (!sprite.flippedHorizontal()) { - sprite.render(g - , (hitbox.getPosX() - (hitboxTranslateX * scale)) - , (hitbox.getPosY() + (hitboxTranslateY * scale)) - - (baseSpriteHeight - baseHitboxH) * scale - + 2 - , scale - ); - } - else { - sprite.render(g - , (hitbox.getPosX() - scale) - , (hitbox.getPosY() + (hitboxTranslateY * scale)) - - (baseSpriteHeight - baseHitboxH) * scale - + 2 - , scale - ); - } - } - } - - @Override - public void updateGlowSprite(GameContainer gc, int delta_t) { - if (spriteGlow != null) spriteGlow.update(delta_t); - } - - @Override - public void updateBodySprite(GameContainer gc, int delta_t) { - if (sprite != null) sprite.update(delta_t); - } - - private float clampW(float x) { - if (x < TSIZE + nextHitbox.getWidth() / 2) { - return TSIZE + nextHitbox.getWidth() / 2; - } - else if (x >= map.width * TSIZE - TSIZE - nextHitbox.getWidth() / 2) { - return map.width * TSIZE - 1 - TSIZE - nextHitbox.getWidth() / 2; - } - else { - return x; - } - } - - private float clampH(float y) { - if (y < TSIZE + nextHitbox.getHeight()) { - return TSIZE + nextHitbox.getHeight(); - } - else if (y >= map.height * TSIZE - TSIZE - nextHitbox.getHeight()) { - return map.height * TSIZE - 1 - TSIZE - nextHitbox.getHeight(); - } - else { - return y; - } - } - - private int clampWtile(int x) { - if (x < 0) { - return 0; - } - else if (x >= map.width) { - return map.width - 1; - } - else { - return x; - } - } - - private int clampHtile(int x) { - if (x < 0) { - return 0; - } - else if (x >= map.height) { - return map.height - 1; - } - else { - return x; - } - } - - private boolean isPlayerNoClip() { - return (this instanceof Player && ((Player) this).isNoClip()); - } - - private static int div16(int x) { - if (x < 0) { throw new IllegalArgumentException("div16: Positive integer only: " - + String.valueOf(x)); } - return (x & 0x7FFF_FFFF) >> 4; - } - - private static int div16TruncateToMapWidth(int x) { - if (x < 0) return 0; - else if (x >= Terrarum.game.map.width << 4) return Terrarum.game.map.width - 1; - else return (x & 0x7FFF_FFFF) >> 4; - } - - private static int div16TruncateToMapHeight(int y) { - if (y < 0) return 0; - else if (y >= Terrarum.game.map.height << 4) return Terrarum.game.map.height - 1; - else return (y & 0x7FFF_FFFF) >> 4; - } - - private static int mod16(int x) { - if (x < 0) { throw new IllegalArgumentException("mod16: Positive integer only: " - + String.valueOf(x)); } - return x & 0b1111; - } - - private static float clampCeil(float x, float ceil) { - return (Math.abs(x) > ceil ? ceil : x); - } - - public void setVisible(boolean visible) { - this.visible = visible; - } - - public void setScale(float scale) { - this.scale = scale; - } - - public void setMass(float mass) { - this.mass = mass; - } - - public void setVeloX(float veloX) { - this.veloX = veloX; - } - - public void setVeloY(float veloY) { - this.veloY = veloY; - } - - public void setGrounded(boolean grounded) { - this.grounded = grounded; - } - - public boolean isVisible() { - return visible; - } - - public float getScale() { - return scale; - } - - public float getMass() { - return mass; - } - - public float getVeloX() { - return veloX; - } - - public float getVeloY() { - return veloY; - } - - public boolean isGrounded() { - return grounded; - } - - public int getBaseHitboxW() { - return baseHitboxW; - } - - public int getBaseHitboxH() { - return baseHitboxH; - } - - public float getHitboxTranslateX() { - return hitboxTranslateX; - } - - public float getHitboxTranslateY() { - return hitboxTranslateY; - } - - public Hitbox getHitbox() { - return hitbox; - } - - public Hitbox getNextHitbox() { - return nextHitbox; - } - - public boolean isUpdate() { - return update; - } - - public void setUpdate(boolean update) { - this.update = update; - } - - private int quantiseTSize(float v) { - return FastMath.floor(v / TSIZE) * TSIZE; - } - - public boolean isNoSubjectToGrav() { - return noSubjectToGrav; - } - - public void setNoSubjectToGrav(boolean noSubjectToGrav) { - this.noSubjectToGrav = noSubjectToGrav; - } - - public boolean isNoCollideWorld() { - return noCollideWorld; - } - - public boolean isNoSubjectToFluidResistance() { - return noSubjectToFluidResistance; - } - - public void setNoCollideWorld(boolean noCollideWorld) { - this.noCollideWorld = noCollideWorld; - } - - public void setNoSubjectToFluidResistance(boolean noSubjectToFluidResistance) { - this.noSubjectToFluidResistance = noSubjectToFluidResistance; - } - - public float getElasticity() { - return elasticity; - } - - public void setElasticity(float elasticity) { - if (elasticity < 0) - throw new IllegalArgumentException("[ActorWithBody] " + elasticity + ": valid elasticity value is [0, 1]."); - - if (elasticity > 1) { - System.out.println("[ActorWithBody] Elasticity were capped to 1."); - this.elasticity = ELASTICITY_MAX; - } - else this.elasticity = elasticity * ELASTICITY_MAX; - } - - public void setDensity(int density) { - if (density < 0) - throw new IllegalArgumentException("[ActorWithBody] " + density + ": density cannot be negative."); - - this.density = density; - } - - @org.jetbrains.annotations.Nullable - @Override - public Long getReferenceID() { - return this.referenceID; - } - - @Override - public void setReferenceID(@org.jetbrains.annotations.Nullable Long aLong) { - referenceID = aLong; - } -} - -/** - - = = ↑ - === ===@! - =↑ =↑ - =↑ = - =↑ = - =@ (pressing R) = -================== ================== - - Fig. 1: the fix was not applied - */ \ No newline at end of file diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/ActorWithBody$Companion.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/ActorWithBody$Companion.class deleted file mode 100644 index 25cdc0ba9..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/ActorWithBody$Companion.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/ActorWithBody.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/ActorWithBody.class deleted file mode 100644 index 51370b80c..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/ActorWithBody.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/CanBeStoredAsItem b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/CanBeStoredAsItem deleted file mode 100644 index 93d9aa723..000000000 --- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/CanBeStoredAsItem +++ /dev/null @@ -1,20 +0,0 @@ -package com.Torvald.Terrarum.Actors; - -import com.Torvald.Terrarum.GameItem.InventoryItem; - -/** - * Created by minjaesong on 16-01-31. - */ -public interface CanBeStoredAsItem { - - void attachItemData(); - - float getItemWeight(); - - void stopUpdateAndDraw(); - - void resumeUpdateAndDraw(); - - InventoryItem getItemData(); - -} diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/CanBeStoredAsItem.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/CanBeStoredAsItem.class deleted file mode 100644 index 33c50554e..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/CanBeStoredAsItem.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Controllable b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Controllable deleted file mode 100644 index 0e3ee33f6..000000000 --- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Controllable +++ /dev/null @@ -1,17 +0,0 @@ -package com.Torvald.Terrarum.Actors; - -import com.Torvald.spriteAnimation.SpriteAnimation; -import org.newdawn.slick.GameContainer; -import org.newdawn.slick.Graphics; -import org.newdawn.slick.Input; - -/** - * Created by minjaesong on 15-12-31. - */ -public interface Controllable { - - void processInput(Input input); - - void keyPressed(int key, char c); - -} diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Controllable.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Controllable.class deleted file mode 100644 index 72cfb963b..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Controllable.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/CreatureFactory b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/CreatureFactory deleted file mode 100644 index 571a8f745..000000000 --- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/CreatureFactory +++ /dev/null @@ -1,137 +0,0 @@ -package com.Torvald.Terrarum.Actors; - -import com.Torvald.JsonFetcher; -import com.Torvald.Rand.Fudge3; -import com.Torvald.Rand.HQRNG; -import com.Torvald.Terrarum.LangPack.Lang; -import com.google.gson.JsonObject; -import org.newdawn.slick.SlickException; - -import java.io.IOException; - -/** - * Created by minjaesong on 16-02-05. - */ -public class CreatureFactory { - - private static final String JSONPATH = "./res/raw/"; - - public ActorWithBody build(String jsonFileName) throws IOException, SlickException { - JsonObject jsonObj = JsonFetcher.readJson(JSONPATH + jsonFileName); - ActorWithBody actor = new ActorWithBody(); - - - String[] elementsString = { - "racename" - , "racenameplural" - }; - - String[] elementsFloat = { - "baseheight" - , "basemass" - , "accel" - , "toolsize" - , "encumbrance" - }; - - String[] elementsFloatVariable = { - "strength" - , "speed" - , "jumppower" - , "scale" - , "speed" - }; - - String[] elementsBoolean = { - "intelligent" - }; - - String[] elementsMultiplyFromOne = { - "physiquemult" - }; - - - setAVStrings(actor, elementsString, jsonObj); - setAVFloats(actor, elementsFloat, jsonObj); - setAVFloatsVariable(actor, elementsFloatVariable, jsonObj); - setAVMultiplyFromOne(actor, elementsMultiplyFromOne, jsonObj); - setAVBooleans(actor, elementsBoolean, jsonObj); - - actor.actorValue.set("accel", Player.WALK_ACCEL_BASE); - actor.actorValue.set("accelmult", 1f); - - actor.inventory = new ActorInventory((int) actor.actorValue.get("encumberance"), true); - - return actor; - } - - /** - * Fetch and set actor values that have 'variable' appended. E.g. strength - * @param p - * @param elemSet - * @param jsonObject - */ - private void setAVFloatsVariable(ActorWithBody p, String[] elemSet, JsonObject jsonObject) { - for (String s : elemSet) { - float baseValue = jsonObject.get(s).getAsFloat(); - // roll fudge dice and get value [-3, 3] as [0, 6] - int varSelected = new Fudge3(new HQRNG()).rollForArray(); - // get multiplier from json. Assuming percentile - int multiplier = jsonObject.get(s + "variable").getAsJsonArray().get(varSelected).getAsInt(); - float realValue = baseValue * multiplier / 100f; - - p.actorValue.set(s, realValue); - } - } - - /** - * Fetch and set string actor values - * @param p - * @param elemSet - * @param jsonObject - */ - private void setAVStrings(ActorWithBody p, String[] elemSet, JsonObject jsonObject) { - for (String s : elemSet) { - String key = jsonObject.get(s).getAsString(); - p.actorValue.set(s, Lang.get(key)); - } - } - - /** - * Fetch and set float actor values - * @param p - * @param elemSet - * @param jsonObject - */ - private void setAVFloats(ActorWithBody p, String[] elemSet, JsonObject jsonObject) { - for (String s : elemSet) { - p.actorValue.set(s, jsonObject.get(s).getAsFloat()); - } - } - - /** - * Fetch and set actor values that should multiplier be applied to the base value of 1. - * E.g. physiquemult - * @param p - * @param elemSet - * @param jsonObject - */ - private void setAVMultiplyFromOne(ActorWithBody p, String[] elemSet, JsonObject jsonObject) { - for (String s : elemSet) { - float baseValue = 1f; - // roll fudge dice and get value [-3, 3] as [0, 6] - int varSelected = new Fudge3(new HQRNG()).rollForArray(); - // get multiplier from json. Assuming percentile - int multiplier = jsonObject.get(s).getAsJsonArray().get(varSelected).getAsInt(); - float realValue = baseValue * multiplier / 100f; - - p.actorValue.set(s, realValue); - } - } - - private void setAVBooleans(ActorWithBody p, String[] elemSet, JsonObject jsonObject) { - for (String s : elemSet) { - p.actorValue.set(s, jsonObject.get(s).getAsBoolean()); - } - } -} diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/CreatureFactory.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/CreatureFactory.class deleted file mode 100644 index 052e4edff..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/CreatureFactory.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/CreatureFactoryKt.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/CreatureFactoryKt.class deleted file mode 100644 index 666802a3c..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/CreatureFactoryKt.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Faction/Faction.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Faction/Faction.class deleted file mode 100644 index 7f42c91d6..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Faction/Faction.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Faction/FactionRelatorFactory.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Faction/FactionRelatorFactory.class deleted file mode 100644 index f56c34412..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Faction/FactionRelatorFactory.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Factionable b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Factionable deleted file mode 100644 index 1ad44cfb0..000000000 --- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Factionable +++ /dev/null @@ -1,17 +0,0 @@ -package com.Torvald.Terrarum.Actors; - -import com.Torvald.Terrarum.Actors.Faction.Faction; - -import java.util.HashSet; - -/** - * Created by minjaesong on 16-02-15. - */ -public interface Factionable { - - void assignFaction(Faction f); - void unassignFaction(Faction f); - HashSet getAssignedFactions(); - void clearFactionAssigning(); - -} diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Factionable.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Factionable.class deleted file mode 100644 index 9c4ab5722..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Factionable.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Glowing b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Glowing deleted file mode 100644 index 01be025aa..000000000 --- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Glowing +++ /dev/null @@ -1,15 +0,0 @@ -package com.Torvald.Terrarum.Actors; - -import org.newdawn.slick.GameContainer; -import org.newdawn.slick.Graphics; - -/** - * Created by minjaesong on 16-01-25. - */ -public interface Glowing { - - void drawGlow(GameContainer gc, Graphics g); - - void updateGlowSprite(GameContainer gc, int delta_t); - -} diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Glowing.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Glowing.class deleted file mode 100644 index eb1d8bd87..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Glowing.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Hitbox.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Hitbox.class deleted file mode 100644 index f760d47bd..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Hitbox.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/ItemProperties/Material.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/ItemProperties/Material.class deleted file mode 100644 index 1b8e13775..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/ItemProperties/Material.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/ItemProperties/MaterialFactory.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/ItemProperties/MaterialFactory.class deleted file mode 100644 index 988c20c65..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/ItemProperties/MaterialFactory.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/ItemTangible.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/ItemTangible.class deleted file mode 100644 index 91e0f5d17..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/ItemTangible.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Landholder b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Landholder deleted file mode 100644 index a76f694f1..000000000 --- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Landholder +++ /dev/null @@ -1,16 +0,0 @@ -package com.Torvald.Terrarum.Actors; - -import java.util.ArrayList; - -/** - * Created by minjaesong on 16-02-20. - */ -public interface Landholder { - - ArrayList getHouseDesignation(); - void setHouseDesignation(ArrayList list); - void addHouseTile(int x, int y); - void removeHouseTile(int x, int y); - void clearHouseDesignation(); - -} diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Landholder.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Landholder.class deleted file mode 100644 index 2d49e126f..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Landholder.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Luminous b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Luminous deleted file mode 100644 index f0b1e7730..000000000 --- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Luminous +++ /dev/null @@ -1,11 +0,0 @@ -package com.Torvald.Terrarum.Actors; - -/** - * Created by minjaesong on 16-02-19. - */ -public interface Luminous { - - void setLuminance(char RGB); - char getLuminance(); - -} diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Luminous.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Luminous.class deleted file mode 100644 index 58dc8ac0b..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Luminous.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/NPCIntelligentBase b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/NPCIntelligentBase deleted file mode 100644 index eae22f103..000000000 --- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/NPCIntelligentBase +++ /dev/null @@ -1,152 +0,0 @@ -package com.Torvald.Terrarum.Actors; - -import com.Torvald.Terrarum.Actors.AI.ActorAI; -import com.Torvald.Terrarum.Actors.Faction.Faction; -import com.Torvald.Terrarum.GameItem.InventoryItem; -import com.Torvald.Terrarum.Terrarum; -import org.newdawn.slick.GameContainer; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.HashSet; - -/** - * Created by minjaesong on 16-01-31. - */ -public class NPCIntelligentBase extends ActorWithBody implements AIControlled, Pocketed, CanBeStoredAsItem, - Factionable, Landholder { - - private InventoryItem itemData; // keep it for extendibility, like Carriers in SC1 - private transient ActorAI ai; - private ActorInventory inventory; - - private HashSet factionSet = new HashSet<>(); - - /** - * Absolute tile index. index(x, y) = y * map.width + x
- * The arraylist will be saved in JSON format with GSON. - */ - private ArrayList houseTiles = new ArrayList<>(); - - @Override - public void assignFaction(Faction f) { - factionSet.add(f); - } - - @Override - public void unassignFaction(Faction f) { - factionSet.remove(f); - } - - @Override - public HashSet getAssignedFactions() { - return factionSet; - } - - @Override - public void clearFactionAssigning() { - factionSet.clear(); - } - - @Override - public void attachItemData() { - itemData = new InventoryItem() { - @Override - public long getItemID() { - return 0; - } - - @Override - public float getWeight() { - return 0; - } - - @Override - public void effectWhileInPocket(GameContainer gc, int delta_t) { - - } - - @Override - public void effectWhenPickedUp(GameContainer gc, int delta_t) { - - } - - @Override - public void primaryUse(GameContainer gc, int delta_t) { - - } - - @Override - public void secondaryUse(GameContainer gc, int delta_t) { - - } - - @Override - public void effectWhenThrownAway(GameContainer gc, int delta_t) { - - } - }; - } - - @Override - public float getItemWeight() { - return super.getMass(); - } - - @Override - public ArrayList getHouseDesignation() { - return houseTiles; - } - - @Override - public void setHouseDesignation(ArrayList list) { - houseTiles = list; - } - - @Override - public void addHouseTile(int x, int y) { - houseTiles.add(Terrarum.game.map.width * y + x); - } - - @Override - public void removeHouseTile(int x, int y) { - houseTiles.remove(new Integer(Terrarum.game.map.width * y + x)); - } - - @Override - public void clearHouseDesignation() { - houseTiles.clear(); - } - - @Override - public void stopUpdateAndDraw() { - super.setUpdate(false); - super.setVisible(false); - } - - @Override - public void resumeUpdateAndDraw() { - super.setUpdate(true); - super.setVisible(true); - } - - @Override - public InventoryItem getItemData() { - return itemData; - } - - @Override - public ActorInventory getInventory() { - return null; - } - - @Override - public void overwriteInventory(ActorInventory inventory) { - this.inventory = inventory; - } - - @Override - public void attachAI(ActorAI ai) { - this.ai = ai; - } -} diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/NPCIntelligentBase$attachItemData$1.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/NPCIntelligentBase$attachItemData$1.class deleted file mode 100644 index bdc9c0d44..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/NPCIntelligentBase$attachItemData$1.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/NPCIntelligentBase.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/NPCIntelligentBase.class deleted file mode 100644 index 930a251d9..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/NPCIntelligentBase.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/PFSigrid b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/PFSigrid deleted file mode 100644 index 197a1b9f8..000000000 --- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/PFSigrid +++ /dev/null @@ -1,104 +0,0 @@ -package com.Torvald.Terrarum.Actors; - -import com.Torvald.JsonFetcher; -import com.Torvald.Terrarum.Actors.Faction.Faction; -import com.Torvald.Terrarum.Game; -import com.Torvald.spriteAnimation.SpriteAnimation; -import com.google.gson.JsonObject; -import org.lwjgl.Sys; -import org.newdawn.slick.SlickException; - -import java.io.IOException; - -/** - * Created by minjaesong on 16-02-03. - */ -public class PFSigrid { - - private static String FACTION_PATH = "./res/raw/"; - - public Player build() throws SlickException { - Player p = new Player(); - - p.sprite = new SpriteAnimation(); - p.sprite.setDimension(28, 51); - p.sprite.setSpriteImage("res/graphics/sprites/test_player.png"); - p.sprite.setDelay(200); - p.sprite.setRowsAndFrames(1, 1); - p.sprite.setAsVisible(); - p.sprite.composeSprite(); - - p.spriteGlow = new SpriteAnimation(); - p.spriteGlow.setDimension(28, 51); - p.spriteGlow.setSpriteImage("res/graphics/sprites/test_player_glow.png"); - p.spriteGlow.setDelay(200); - p.spriteGlow.setRowsAndFrames(1, 1); - p.spriteGlow.setAsVisible(); - p.spriteGlow.composeSprite(); - - p.actorValue = new ActorValue(); - p.actorValue.set("scale", 1.0f); - p.actorValue.set("speed", 4.0f); - p.actorValue.set("speedmult", 1.0f); - p.actorValue.set("accel", Player.WALK_ACCEL_BASE); - p.actorValue.set("accelmult", 1.0f); - - p.actorValue.set("jumppower", 5f); - - p.actorValue.set("basemass", 80f); - - p.actorValue.set("physiquemult", 1); // Constant 1.0 for player, meant to be used by random mobs - /** - * fixed value, or 'base value', from creature strength of Dwarf Fortress. - * Human race uses 1000. (see CreatureHuman.json) - */ - p.actorValue.set("strength", 1414); - p.actorValue.set("encumbrance", 1000); - - p.actorValue.set("name", "Sigrid"); - - p.actorValue.set("intelligent", true); - - p.actorValue.set("luminosity", 22819); - - p.actorValue.set("selectedtile", 16); - - p.setHitboxDimension(18, 46, 8, 0); - - p.setInventory(new ActorInventory(0x7FFFFFFF, true)); - - p.setPosition(4096 * 16, 300 * 16); - - p.assignFaction(loadFactioningData("FactionSigrid.json")); - - return p; - } - - private Faction loadFactioningData(String filename) { - JsonObject jsonObject = null; - try { - jsonObject = JsonFetcher.readJson(FACTION_PATH + filename); - } - catch (IOException e) { - e.printStackTrace(); - System.exit(-1); - } - - Faction faction = new Faction(jsonObject.get("factionname").getAsString()); - - jsonObject.get("factionamicable").getAsJsonArray().forEach( - jobj -> faction.addFactionAmicable(jobj.getAsString()) - ); - jsonObject.get("factionneutral").getAsJsonArray().forEach( - jobj -> faction.addFactionNeutral(jobj.getAsString()) - ); - jsonObject.get("factionhostile").getAsJsonArray().forEach( - jobj -> faction.addFactionHostile(jobj.getAsString()) - ); - jsonObject.get("factionfearful").getAsJsonArray().forEach( - jobj -> faction.addFactionFearful(jobj.getAsString()) - ); - - return faction; - } -} diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/PFSigrid$Companion.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/PFSigrid$Companion.class deleted file mode 100644 index 34119565f..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/PFSigrid$Companion.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/PFSigrid.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/PFSigrid.class deleted file mode 100644 index f781c509f..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/PFSigrid.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/PhysTestBall b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/PhysTestBall deleted file mode 100644 index 930bb6b66..000000000 --- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/PhysTestBall +++ /dev/null @@ -1,29 +0,0 @@ -package com.Torvald.Terrarum.Actors; - -import org.newdawn.slick.Color; -import org.newdawn.slick.GameContainer; -import org.newdawn.slick.Graphics; - -/** - * Created by minjaesong on 16-03-05. - */ -public class PhysTestBall extends ActorWithBody { - - public PhysTestBall() { - super(); - setHitboxDimension(16, 16, 0, 0); - setVisible(true); - setMass(10f); - } - - @Override - public void drawBody(GameContainer gc, Graphics g) { - g.setColor(Color.orange); - g.fillOval( - getHitbox().getPosX() - , getHitbox().getPosY() - , getHitbox().getWidth() - , getHitbox().getHeight() - ); - } -} diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/PhysTestBall.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/PhysTestBall.class deleted file mode 100644 index deec5d57e..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/PhysTestBall.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Player b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Player deleted file mode 100644 index 81db85bd4..000000000 --- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Player +++ /dev/null @@ -1,571 +0,0 @@ -package com.Torvald.Terrarum.Actors; - -import com.Torvald.Terrarum.Actors.Faction.Faction; -import com.Torvald.Terrarum.GameControl.EnumKeyFunc; -import com.Torvald.Terrarum.GameControl.KeyMap; -import com.Torvald.Terrarum.MapDrawer.MapDrawer; -import com.Torvald.Terrarum.Terrarum; -import com.Torvald.spriteAnimation.SpriteAnimation; -import com.jme3.math.FastMath; -import com.sun.istack.internal.NotNull; -import com.sun.istack.internal.Nullable; -import org.lwjgl.input.Controller; -import org.lwjgl.input.Controllers; -import org.newdawn.slick.*; - -import java.io.Serializable; -import java.util.HashSet; - -/** - * Created by minjaesong on 15-12-31. - */ -public class Player extends ActorWithBody implements Controllable, Pocketed, Factionable, Luminous { - - public transient @Nullable Controllable vehicleRiding; - - int jumpCounter = 0; - int walkPowerCounter = 0; - private transient final int MAX_JUMP_LENGTH = 17; // use 17; in internal frames - /** - * experimental value. - */ - // private transient final float JUMP_ACCELERATION_MOD = ???f / 10000f; //quadratic mode - private transient final float JUMP_ACCELERATION_MOD = 170f / 10000f; //linear mode - private transient final int WALK_FRAMES_TO_MAX_ACCEL = 6; - - public float readonly_totalX = 0, readonly_totalY = 0; - - boolean jumping = false; - - @NotNull int walkHeading; - - private transient final int LEFT = 1; - private transient final int RIGHT = 2; - - private transient final int KEY_NULL = -1; - private transient int prevHMoveKey = KEY_NULL; - private transient int prevVMoveKey = KEY_NULL; - - static transient final float ACCEL_MULT_IN_FLIGHT = 0.48f; - static transient final float WALK_STOP_ACCEL = 0.32f; - static transient final float WALK_ACCEL_BASE = 0.32f; - - private boolean noClip = false; - - public static transient final long PLAYER_REF_ID = 0x51621D; - - private transient final float AXIS_POSMAX = 1.0f; - private transient final int GAMEPAD_JUMP = 5; - - private transient final int TSIZE = MapDrawer.TILE_SIZE; - - private HashSet factionSet = new HashSet<>(); - - private transient final int BASE_DENSITY = 1020; - - - /** - * Creates new Player instance with empty elements (sprites, actorvalue, etc.).
- * - * Use PlayerBuildFactory to build player! - * - * @throws SlickException - */ - public Player() throws SlickException { - super(); - referenceID = PLAYER_REF_ID; - setVisible(true); - super.setDensity(BASE_DENSITY); - } - - @Override - public void update(GameContainer gc, int delta_t) { - if (vehicleRiding instanceof Player) throw new RuntimeException("Attempted to 'ride' " + - "player object."); - - updatePhysicalInfos(); - super.update(gc, delta_t); - - updateSprite(delta_t); - - updateMovementControl(); - - if (noClip) { super.setGrounded(true); } - - } - - private void updatePhysicalInfos() { - super.setScale(actorValue.getAsFloat("scale")); - super.setMass(actorValue.getAsFloat("basemass") - * FastMath.pow(super.getScale(), 3)); - if (super.getElasticity() != 0) super.setElasticity(0); - } - - /** - * - * @param left (even if the game is joypad controlled, you must give valid value) - * @param absAxisVal (set AXIS_POSMAX if keyboard controlled) - */ - private void walkHorizontal(boolean left, float absAxisVal) { - //if ((!super.isWalledLeft() && left) || (!super.isWalledRight() && !left)) { - readonly_totalX = super.getVeloX() - + - actorValue.getAsFloat("accel") - * actorValue.getAsFloat("accelmult") - * FastMath.sqrt(super.getScale()) - * applyAccelRealism(walkPowerCounter) - * (left ? -1 : 1) - * absAxisVal; - - super.setVeloX(readonly_totalX); - - if (walkPowerCounter < WALK_FRAMES_TO_MAX_ACCEL) { - walkPowerCounter += 1; - } - - // Clamp veloX - super.setVeloX( - absClamp(super.getVeloX() - , actorValue.getAsFloat("speed") - * actorValue.getAsFloat("speedmult") - * FastMath.sqrt(super.getScale()) - ) - ); - - // Heading flag - if (left) walkHeading = LEFT; - else walkHeading = RIGHT; - //} - } - - /** - * - * @param up (even if the game is joypad controlled, you must give valid value) - * @param absAxisVal (set AXIS_POSMAX if keyboard controlled) - */ - private void walkVertical(boolean up, float absAxisVal) { - readonly_totalY = super.getVeloY() - + - actorValue.getAsFloat("accel") - * actorValue.getAsFloat("accelmult") - * FastMath.sqrt(super.getScale()) - * applyAccelRealism(walkPowerCounter) - * (up ? -1 : 1) - * absAxisVal; - - super.setVeloY(readonly_totalY); - - if (walkPowerCounter < WALK_FRAMES_TO_MAX_ACCEL) { - walkPowerCounter += 1; - } - - // Clamp veloX - super.setVeloY( - absClamp(super.getVeloY() - , actorValue.getAsFloat("speed") - * actorValue.getAsFloat("speedmult") - * FastMath.sqrt(super.getScale()) - ) - ); - } - - /** - * For realistic accelerating while walking. - * - * Naïve 'veloX += 3' is actually like: - * - * a - * | ------------ - * | - * | - * 0+------············ t - * - * which is unrealistic, so this method tries to introduce some realism by doing: - * - * a - * | ------------ - * | --- - * | - - * | --- - * 0+----··················· t - * - * - * @param x - */ - private float applyAccelRealism(int x) { - return 0.5f + 0.5f * -FastMath.cos(10 * x / (WALK_FRAMES_TO_MAX_ACCEL * FastMath.PI)); - } - - private void walkHStop() { - if (super.getVeloX() > 0) { - super.setVeloX(super.getVeloX() - - - actorValue.getAsFloat("accel") - * actorValue.getAsFloat("accelmult") - * FastMath.sqrt(super.getScale()) - ); - - // compensate overshoot - if (super.getVeloX() < 0) - super.setVeloX(0); - } - else if (super.getVeloX() < 0) { - super.setVeloX(super.getVeloX() - + - actorValue.getAsFloat("accel") - * actorValue.getAsFloat("accelmult") - * FastMath.sqrt(super.getScale()) - ); - - // compensate overshoot - if (super.getVeloX() > 0) - super.setVeloX(0); - } - else { - super.setVeloX(0); - } - - walkPowerCounter = 0; - } - - private void walkVStop() { - if (super.getVeloY() > 0) { - super.setVeloY(super.getVeloY() - - - WALK_STOP_ACCEL - * actorValue.getAsFloat("accelmult") - * FastMath.sqrt(super.getScale()) - ); - - // compensate overshoot - if (super.getVeloY() < 0) - super.setVeloY(0); - } - else if (super.getVeloY() < 0) { - super.setVeloY(super.getVeloY() - + - WALK_STOP_ACCEL - * actorValue.getAsFloat("accelmult") - * FastMath.sqrt(super.getScale()) - ); - - // compensate overshoot - if (super.getVeloY() > 0) - super.setVeloY(0); - } - else { - super.setVeloY(0); - } - - walkPowerCounter = 0; - } - - private void updateMovementControl() { - if (!noClip) { - if (super.isGrounded()) { - actorValue.set("accelmult", 1f); - } else { - actorValue.set("accelmult", ACCEL_MULT_IN_FLIGHT); - } - } - else { - actorValue.set("accelmult", 1f); - } - } - - public void processInput(Input input) { - Controller gamepad = null; - float axisX = 0, axisY = 0, axisRX = 0, axisRY = 0; - if (Terrarum.hasController) { - gamepad = Controllers.getController(0); - axisX = gamepad.getAxisValue(0); - axisY = gamepad.getAxisValue(1); - axisRX = gamepad.getAxisValue(2); - axisRY = gamepad.getAxisValue(3); - - if (Math.abs(axisX) < Terrarum.CONTROLLER_DEADZONE) axisX = 0; - if (Math.abs(axisY) < Terrarum.CONTROLLER_DEADZONE) axisY = 0; - if (Math.abs(axisRX) < Terrarum.CONTROLLER_DEADZONE) axisRX = 0; - if (Math.abs(axisRY) < Terrarum.CONTROLLER_DEADZONE) axisRY = 0; - } - - /** - * L-R stop - */ - if (Terrarum.hasController) { - if (axisX == 0) { - walkHStop(); - } - } - else { - // ↑F, ↑S - if (!isFuncDown(input, EnumKeyFunc.MOVE_LEFT) - && !isFuncDown(input, EnumKeyFunc.MOVE_RIGHT)) { - walkHStop(); - prevHMoveKey = KEY_NULL; - } - } - /** - * U-D stop - */ - if (Terrarum.hasController) { - if (axisY == 0) { - walkVStop(); - } - } - else { - // ↑E - // ↑D - if (isNoClip() - && !isFuncDown(input, EnumKeyFunc.MOVE_UP) - && !isFuncDown(input, EnumKeyFunc.MOVE_DOWN)) { - walkVStop(); - prevVMoveKey = KEY_NULL; - } - } - - /** - * Left/Right movement - */ - - if (Terrarum.hasController) { - if (axisX != 0) { - walkHorizontal(axisX < 0, AXIS_POSMAX); - } - } - else { - // ↑F, ↓S - if (isFuncDown(input, EnumKeyFunc.MOVE_RIGHT) - && !isFuncDown(input, EnumKeyFunc.MOVE_LEFT)) { - walkHorizontal(false, AXIS_POSMAX); - prevHMoveKey = KeyMap.getKeyCode(EnumKeyFunc.MOVE_RIGHT); - } - // ↓F, ↑S - else if (isFuncDown(input, EnumKeyFunc.MOVE_LEFT) - && !isFuncDown(input, EnumKeyFunc.MOVE_RIGHT)) { - walkHorizontal(true, AXIS_POSMAX); - prevHMoveKey = KeyMap.getKeyCode(EnumKeyFunc.MOVE_LEFT); - } - // ↓F, ↓S - else if (isFuncDown(input, EnumKeyFunc.MOVE_LEFT) - && isFuncDown(input, EnumKeyFunc.MOVE_RIGHT)) { - if (prevHMoveKey == KeyMap.getKeyCode(EnumKeyFunc.MOVE_LEFT)) { - walkHorizontal(false, AXIS_POSMAX); - prevHMoveKey = KeyMap.getKeyCode(EnumKeyFunc.MOVE_RIGHT); - } - else if (prevHMoveKey == KeyMap.getKeyCode(EnumKeyFunc.MOVE_RIGHT)) { - walkHorizontal(true, AXIS_POSMAX); - prevHMoveKey = KeyMap.getKeyCode(EnumKeyFunc.MOVE_LEFT); - } - } - } - - /** - * Up/Down movement - */ - if (noClip) { - if (Terrarum.hasController) { - if (axisY != 0) { - walkVertical(axisY > 0, AXIS_POSMAX); - } - } - else { - // ↑E - // ↓D - if (isFuncDown(input, EnumKeyFunc.MOVE_DOWN) - && !isFuncDown(input, EnumKeyFunc.MOVE_UP)) { - walkVertical(false, AXIS_POSMAX); - prevVMoveKey = KeyMap.getKeyCode(EnumKeyFunc.MOVE_DOWN); - } - // ↓E - // ↑D - else if (isFuncDown(input, EnumKeyFunc.MOVE_UP) - && !isFuncDown(input, EnumKeyFunc.MOVE_DOWN)) { - walkVertical(true, AXIS_POSMAX); - prevVMoveKey = KeyMap.getKeyCode(EnumKeyFunc.MOVE_UP); - } - // ↓E - // ↓D - else if (isFuncDown(input, EnumKeyFunc.MOVE_UP) - && isFuncDown(input, EnumKeyFunc.MOVE_DOWN)) { - if (prevVMoveKey == KeyMap.getKeyCode(EnumKeyFunc.MOVE_UP)) { - walkVertical(false, AXIS_POSMAX); - prevVMoveKey = KeyMap.getKeyCode(EnumKeyFunc.MOVE_DOWN); - } - else if (prevVMoveKey == KeyMap.getKeyCode(EnumKeyFunc.MOVE_DOWN)) { - walkVertical(true, AXIS_POSMAX); - prevVMoveKey = KeyMap.getKeyCode(EnumKeyFunc.MOVE_UP); - } - } - } - } - - /** - * Jump control - */ - if (isFuncDown(input, EnumKeyFunc.JUMP) - || (Terrarum.hasController && gamepad.isButtonPressed(GAMEPAD_JUMP))) { - if (!noClip) { - if (super.isGrounded()) { - jumping = true; - } - jump(); - } - else { - walkVertical(true, AXIS_POSMAX); - } - } - else { - jumping = false; - jumpCounter = 0; - } - - } - - public void keyPressed(int key, char c) { - - } - - /** - * See ./work_files/Jump\ power\ by\ pressing\ time.gcx - */ - private void jump() { - if (jumping) { - float len = MAX_JUMP_LENGTH; - float pwr = actorValue.getAsFloat("jumppower"); - - // increment jump counter - if (jumpCounter < len) jumpCounter += 1; - // quadratic time (convex) mode - /* - float sumT = (jumpCounter * (jumpCounter + 1)) / 2f; - float timedJumpCharge = ((len + 1) / 2f) - (sumT / len); - if (timedJumpCharge < 0) timedJumpCharge = 0; - - float jumpAcc = pwr * timedJumpCharge * JUMP_ACCELERATION_MOD; - - super.setVeloY(super.getVeloY() - - jumpAcc - ); - */ - - // linear time mode - float init = (len + 1) / 2f; - float timedJumpCharge = init - (init / len) * jumpCounter; - if (timedJumpCharge < 0) timedJumpCharge = 0; - - float jumpAcc = pwr * timedJumpCharge * JUMP_ACCELERATION_MOD - * FastMath.sqrt(getScale()); - - super.setVeloY(super.getVeloY() - - jumpAcc - ); - - // concave mode? - } - - // for mob AI: - //super.setVeloY(super.getVeloY() - // - - // pwr * FastMath.sqrt(super.getScale()) - //); - } - - private float jumpFuncLin(float pwr, float len) { - return -(pwr / len) * jumpCounter; - } - - private float jumpFuncSqu(float pwr, float len) { - return (pwr / (len * len)) - * (jumpCounter - len) - * (jumpCounter - len) // square - - pwr; - } - - private float jumpFuncExp(float pwr, float len) { - float a = FastMath.pow(pwr + 1, 1 / len); - return -FastMath.pow(a, len) + 1; - } - - private boolean isFuncDown(Input input, EnumKeyFunc fn) { - return input.isKeyDown(KeyMap.getKeyCode(fn)); - } - - private float absClamp(float i, float ceil) { - if (i > 0) - return (i > ceil) ? ceil : i; - else if (i < 0) - return (-i > ceil) ? -ceil : i; - else - return 0; - } - - private void updateSprite(int delta_t) { - sprite.update(delta_t); - if (spriteGlow != null) { - spriteGlow.update(delta_t); - } - - if (super.isGrounded()) { - if (walkHeading == LEFT) { - sprite.flip(true, false); - if (spriteGlow != null) { - spriteGlow.flip(true, false); - } - } - else { - sprite.flip(false, false); - if (spriteGlow != null) { - spriteGlow.flip(false, false); - } - } - } - } - - public boolean isNoClip() { - return noClip; - } - - public void setNoClip(boolean b) { - noClip = b; - } - - public ActorValue getActorValue() { - return actorValue; - } - - public SpriteAnimation getSpriteGlow() { - return spriteGlow; - } - - @Override - public void assignFaction(Faction f) { - factionSet.add(f); - } - - @Override - public void unassignFaction(Faction f) { - factionSet.remove(f); - } - - @Override - public HashSet getAssignedFactions() { - return factionSet; - } - - @Override - public void clearFactionAssigning() { - factionSet.clear(); - } - - @Override - public void setLuminance(char RGB) { - actorValue.set("luminosity", (int) RGB); - } - - @Override - public char getLuminance() { - return actorValue.hasKey("luminosity") ? - (char) actorValue.getAsInt("luminosity") : 0; - } -} diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Player$Companion.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Player$Companion.class deleted file mode 100644 index b7a735d7b..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Player$Companion.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Player.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Player.class deleted file mode 100644 index 89aa3a295..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Player.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/PlayerDebugger b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/PlayerDebugger deleted file mode 100644 index 3999b080c..000000000 --- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/PlayerDebugger +++ /dev/null @@ -1,46 +0,0 @@ -package com.Torvald.Terrarum.Actors; - -import com.Torvald.spriteAnimation.SpriteAnimation; - -/** - * Created by minjaesong on 16-01-14. - */ -public class PlayerDebugger { - - private Actor actor; - - public PlayerDebugger(Actor actor) { - this.actor = actor; - } - - public Player getPlayer() { - if (actor instanceof Player) { - return (Player) actor; - } - else { - throw new UnsupportedOperationException(); - } - } - - /** - * Delegates for Player instances - */ - - public float baseHitboxW() { return getPlayer().getBaseHitboxW(); } - public float baseHitboxH() { return getPlayer().getBaseHitboxH(); } - public float hitboxTranslateX() { return getPlayer().getHitboxTranslateX(); } - public float hitboxTranslateY() { return getPlayer().getHitboxTranslateY(); } - public float veloX() { return getPlayer().getVeloX(); } - public float veloY() { return getPlayer().getVeloY(); } - public int baseSpriteWidth() { return getPlayer().baseSpriteWidth; } - public int baseSpriteHeight() { return getPlayer().baseSpriteHeight; } - public SpriteAnimation sprite() { return getPlayer().sprite; } - public float scale() { return getPlayer().getScale(); } - public Hitbox hitbox() { return getPlayer().getHitbox(); } - public Hitbox nextHitbox() { return getPlayer().getNextHitbox(); } - public boolean grounded() { return getPlayer().getGrounded(); } - public ActorValue actorValue() { return getPlayer().getActorValue(); } - public float mass() { return getPlayer().getMass(); } - public boolean noClip() { return getPlayer().isNoClip(); } - public int eventMoving() { return getPlayer().eventMoving; } -} diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/PlayerFactory.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/PlayerFactory.class deleted file mode 100644 index 441b72509..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/PlayerFactory.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/PlayerKt.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/PlayerKt.class deleted file mode 100644 index c8bb2e657..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/PlayerKt.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Pocketed.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Pocketed.class deleted file mode 100644 index 308d4fbe2..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Pocketed.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Visible b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Visible deleted file mode 100644 index f78a6cdf4..000000000 --- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Visible +++ /dev/null @@ -1,15 +0,0 @@ -package com.Torvald.Terrarum.Actors; - -import org.newdawn.slick.GameContainer; -import org.newdawn.slick.Graphics; - -/** - * Created by minjaesong on 16-01-25. - */ -public interface Visible { - - void drawBody(GameContainer gc, Graphics g); - - void updateBodySprite(GameContainer gc, int delta_t); - -} diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Visible.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Visible.class deleted file mode 100644 index 679e2f7a4..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Visible.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/COPYING b/out/production/Terrarum_renewed/com/Torvald/Terrarum/COPYING deleted file mode 100644 index e78cbe395..000000000 --- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/COPYING +++ /dev/null @@ -1,6 +0,0 @@ -* Terrarum by Torvald - Copyright 2015-2016 Torvald. All rights reserved. - mailto: alswo9628 *at* !gmail! *dot* !com! - -* Simplex Noise Generator, version 2012-03-09 by Stefan Gustavson - Released as public domain diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/Authenticator.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/Authenticator.class deleted file mode 100644 index 8230c03b5..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/Authenticator.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/Batch.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/Batch.class deleted file mode 100644 index 25c8fde3c..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/Batch.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/CatStdout.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/CatStdout.class deleted file mode 100644 index a07b4e372..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/CatStdout.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/CodexEdictis.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/CodexEdictis.class deleted file mode 100644 index 60b956d4e..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/CodexEdictis.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/CommandDict.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/CommandDict.class deleted file mode 100644 index c02ba3e5a..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/CommandDict.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/CommandInput.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/CommandInput.class deleted file mode 100644 index 6f7b9d05b..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/CommandInput.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/CommandInterpreter.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/CommandInterpreter.class deleted file mode 100644 index d3dba2daa..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/CommandInterpreter.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/ConsoleCommand.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/ConsoleCommand.class deleted file mode 100644 index 13685b72f..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/ConsoleCommand.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/Echo.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/Echo.class deleted file mode 100644 index 4734d8520..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/Echo.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/ExportAV.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/ExportAV.class deleted file mode 100644 index 1d94091fa..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/ExportAV.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/ExportMap.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/ExportMap.class deleted file mode 100644 index 012e5c6d2..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/ExportMap.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/ForceGC.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/ForceGC.class deleted file mode 100644 index 2460b1288..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/ForceGC.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/GetAV.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/GetAV.class deleted file mode 100644 index dd208e903..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/GetAV.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/GetFactioning.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/GetFactioning.class deleted file mode 100644 index 906e0e5b2..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/GetFactioning.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/GetLocale.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/GetLocale.class deleted file mode 100644 index b542641cc..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/GetLocale.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/GsonTest.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/GsonTest.class deleted file mode 100644 index 0c89397b4..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/GsonTest.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/QuitApp.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/QuitApp.class deleted file mode 100644 index a35956aca..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/QuitApp.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/SetAV.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/SetAV.class deleted file mode 100644 index 23b0cee88..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/SetAV.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/SetBulletin.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/SetBulletin.class deleted file mode 100644 index 670c5d6fa..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/SetBulletin.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/SetGlobalLightLevel.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/SetGlobalLightLevel.class deleted file mode 100644 index 3106411ef..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/SetGlobalLightLevel.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/SetLocale.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/SetLocale.class deleted file mode 100644 index 926768494..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/SetLocale.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/SpawnPhysTestBall.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/SpawnPhysTestBall.class deleted file mode 100644 index 259d59c4b..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/SpawnPhysTestBall.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/TeleportPlayer.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/TeleportPlayer.class deleted file mode 100644 index a6df18f9f..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/TeleportPlayer.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/ToggleNoClip.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/ToggleNoClip.class deleted file mode 100644 index 4c0489a9b..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/ToggleNoClip.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/Zoom.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/Zoom.class deleted file mode 100644 index 5acc8946e..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/Zoom.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/DefaultConfig.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/DefaultConfig.class deleted file mode 100644 index d13b44dad..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/DefaultConfig.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Exceptions/InvalidValueException.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Exceptions/InvalidValueException.class deleted file mode 100644 index fcfd5ccc3..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Exceptions/InvalidValueException.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Game.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Game.class deleted file mode 100644 index a6d549486..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Game.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameConfig.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameConfig.class deleted file mode 100644 index 3ead73d33..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameConfig.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameControl/EnumKeyFunc.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameControl/EnumKeyFunc.class deleted file mode 100644 index 91bab597d..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameControl/EnumKeyFunc.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameControl/GameController.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameControl/GameController.class deleted file mode 100644 index a1eeccd3d..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameControl/GameController.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameControl/Key.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameControl/Key.class deleted file mode 100644 index 1a427d216..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameControl/Key.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameControl/KeyMap.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameControl/KeyMap.class deleted file mode 100644 index d17ab2e3f..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameControl/KeyMap.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameControl/KeyToggler.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameControl/KeyToggler.class deleted file mode 100644 index 8e640dac5..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameControl/KeyToggler.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameItem/InventoryItem.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameItem/InventoryItem.class deleted file mode 100644 index 1d9123e5b..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameItem/InventoryItem.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameItem/ItemCodex.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameItem/ItemCodex.class deleted file mode 100644 index f741d7d72..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameItem/ItemCodex.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameMap/GameMap.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameMap/GameMap.class deleted file mode 100644 index 313157133..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameMap/GameMap.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameMap/MapLayer$1.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameMap/MapLayer$1.class deleted file mode 100644 index d71e19445..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameMap/MapLayer$1.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameMap/MapLayer.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameMap/MapLayer.class deleted file mode 100644 index 03158fb50..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameMap/MapLayer.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameMap/MapPoint.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameMap/MapPoint.class deleted file mode 100644 index 64982fd41..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameMap/MapPoint.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameMap/PairedMapLayer$1.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameMap/PairedMapLayer$1.class deleted file mode 100644 index 26d57bf82..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameMap/PairedMapLayer$1.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameMap/PairedMapLayer.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameMap/PairedMapLayer.class deleted file mode 100644 index 58345670b..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameMap/PairedMapLayer.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameMap/WorldTime.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameMap/WorldTime.class deleted file mode 100644 index e3045e91c..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameMap/WorldTime.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/KVHashMap.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/KVHashMap.class deleted file mode 100644 index 4cfae2146..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/KVHashMap.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/LangPack/Lang$1.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/LangPack/Lang$1.class deleted file mode 100644 index 06b13916a..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/LangPack/Lang$1.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/LangPack/Lang.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/LangPack/Lang.class deleted file mode 100644 index 5426c4cd8..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/LangPack/Lang.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MECHNANICS b/out/production/Terrarum_renewed/com/Torvald/Terrarum/MECHNANICS deleted file mode 100644 index 779518490..000000000 --- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MECHNANICS +++ /dev/null @@ -1,112 +0,0 @@ - -== Weapon tier == - - Natural / Common Stone -> Copper -> Iron -> Silver -> Titanium - Forging --------------> Steel --------^ - Exotic ('elven') Glass Aurichalcum - Special (something 'adamant') ??? (Use material spec of CNT, tensile strength 180 GPa) - - = Metal graphics - - Gold: Hue 43, low Saturation - - Aurichalcum: Hue 43, mid-high Saturation - - Copper: Hue 33, - - Copper rust: Hue 160 - - Iron rust: Hue 21 - - -== Size variation == - - Race base weapon/tool size <- 10 [kg] - Size tolerance <- (50% * str/1000), or say, 20% - - If the size is bigger than tolerable, weapon speed severely slows down, tools become unusable - if use time >= 0.75 second, the weapon/tool cannot be equipped. - Small weapons/tools gains no (dis)advantage - - When drawing: scale by (craftedWeaponSize / baseWeaponSize) - - Crafted tool/weapon size is dependent to the baseRaceMass. - - -== Gemstone tier == - - Topaz -> R·G·B -> Diamond·Amethyst - - -== Colouring == - - Natural: Use 4096 - Magical/Surreal: Use 24 Bits - - = Colouring of potion - - Randomised, roguelike fashion - - Choose Col(R40, G40, B40) from set of finite cards: - 39, 39, 19, 19, 0, 0 - - MULTIPLY blend chosen colour with white texture - - -== Roguelike identity == - - = Randomised things - - E.g. potion - Lime-coloured potion - First play: "Potion (???)" - After drank: "Potion (Healing)" is revealed. - - Second (new) play: "Potion (???)" - After drank: "Potion (Neurotoxin)" is revealed. - - -== Making sprite == - - * Layers - - (Optional) Glow - - (Optional) Hair foreground - - Right arm dress - - Right arm body - - Dress - - Boots - - Body - - (Optional) Hair accessory - - Hair - - Head - - Left arm dress - - Left arm body - - (Optional) SFX - - * Size - - Regular sprite 'height' (hitbox height) : 40 px - - Apparent height may vary - - -== Chargen == - - * Select hair, colours, then compile them into single spritesheet - - * NO gender distinction, but have masculine/neutral/feminine looks (in clothing, hairstyles, etc.) - - * Colour: 4096 colours (12-bit 0x000 - 0xFFF) - - * Base mass: 60 kg - - -== Custom pattern making == - - - Players can create their own décors (hang on wall), dresses. - - Two looms (216 colour mode, 4096 colour mode) - - -== Food/Potion dose == - - Scale ^ 3 ^ (3/4) - = (ThisWgt / TargetWgt) ^ (3/4) - - -== (De)serialisation == - - see SAVE_FORMAT - - -== Actor being universal == - - * Utility tiles that have states (e.g. noteblock) are implemented using Actor. diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapDrawer/LightmapLantern.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapDrawer/LightmapLantern.class deleted file mode 100644 index 166518efd..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapDrawer/LightmapLantern.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapDrawer/LightmapRenderer.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapDrawer/LightmapRenderer.class deleted file mode 100644 index 257748749..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapDrawer/LightmapRenderer.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapDrawer/MapCamera.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapDrawer/MapCamera.class deleted file mode 100644 index e6c52b5c1..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapDrawer/MapCamera.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapDrawer/MapDrawer.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapDrawer/MapDrawer.class deleted file mode 100644 index 3fb634e00..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapDrawer/MapDrawer.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapGenerator/FloatingIslandsPreset.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapGenerator/FloatingIslandsPreset.class deleted file mode 100644 index 0348ac082..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapGenerator/FloatingIslandsPreset.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset01.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset01.class deleted file mode 100644 index 096079db7..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset01.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset02.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset02.class deleted file mode 100644 index 9c713bf9a..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset02.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset03.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset03.class deleted file mode 100644 index cf79df7ed..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset03.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset04.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset04.class deleted file mode 100644 index bf0b36e91..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset04.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset05.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset05.class deleted file mode 100644 index dec7d5056..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset05.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapGenerator/MapGenerator.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapGenerator/MapGenerator.class deleted file mode 100644 index fff906ed6..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapGenerator/MapGenerator.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapGenerator/SimplexNoise.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapGenerator/SimplexNoise.class deleted file mode 100644 index 1ee31b50b..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapGenerator/SimplexNoise.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapGenerator/SimplexNoise_octave$Grad.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapGenerator/SimplexNoise_octave$Grad.class deleted file mode 100644 index 121fca2e9..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapGenerator/SimplexNoise_octave$Grad.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapGenerator/SimplexNoise_octave.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapGenerator/SimplexNoise_octave.class deleted file mode 100644 index aae4c1d99..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapGenerator/SimplexNoise_octave.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapGenerator/floatingIslePreset01.png b/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapGenerator/floatingIslePreset01.png deleted file mode 100644 index 1d5e9ff95..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapGenerator/floatingIslePreset01.png and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapGenerator/floatingIslePreset02.png b/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapGenerator/floatingIslePreset02.png deleted file mode 100644 index 4d436d822..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapGenerator/floatingIslePreset02.png and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapGenerator/floatingIslePreset03.png b/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapGenerator/floatingIslePreset03.png deleted file mode 100644 index 530a94a9c..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapGenerator/floatingIslePreset03.png and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapGenerator/floatingIslePreset04.png b/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapGenerator/floatingIslePreset04.png deleted file mode 100644 index 09cc75133..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapGenerator/floatingIslePreset04.png and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapGenerator/floatingIslePreset05.png b/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapGenerator/floatingIslePreset05.png deleted file mode 100644 index 9d6bd1481..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapGenerator/floatingIslePreset05.png and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/NoNegative.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/NoNegative.class deleted file mode 100644 index 23f810b12..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/NoNegative.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/NonZero.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/NonZero.class deleted file mode 100644 index 05198ba98..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/NonZero.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/NotNull.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/NotNull.class deleted file mode 100644 index 0e133803c..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/NotNull.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Nullable.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Nullable.class deleted file mode 100644 index 6b9e057e6..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Nullable.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/RoguelikeRandomiser.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/RoguelikeRandomiser.class deleted file mode 100644 index 1d6f568ba..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/RoguelikeRandomiser.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/SAVE_FORMAT b/out/production/Terrarum_renewed/com/Torvald/Terrarum/SAVE_FORMAT deleted file mode 100644 index 38c6f9583..000000000 --- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/SAVE_FORMAT +++ /dev/null @@ -1,55 +0,0 @@ -* Save meta - - Binary (for more security) - - Filename : world (with no extension) - - Type Mnemonic Description - - Byte[4] TESV Magic - Byte[n] name Savegame name, UTF-8 - Byte null String terminator - Byte[8] terraseed Terrain seed - Byte[8] possible other seeds - Byte[32] hash1 SHA-256 hash of worldinfo1 being stored - Byte[32] hash2 SHA-256 hash of worldinfo2 being stored - Byte[32] hash3 SHA-256 hash of worldinfo3 being stored - Byte[32] hash4 SHA-256 hash of worldinfo4 beihg stored (TEMD data) [32, 214, 42, 3, 76, ...] - - -* Actor data - - GZip'd GSON - - Filename : (with no extension) - - -* Prop data - - GZip'd CSV - - Filename : worldinfo1 -- tileprop.csv - worldinfo2 -- itemprop.csv (with no extension) - - -* Roguelike randomiser data - - GZip'd GSON - - Filename : worldinfo3 - - -* Human-readable - - Tiles_list.txt -- list of tiles in csv - - Items_list.txt -- list of items in csv - - - -== How it works == - * If hash discrepancy is detected, (hash of csv in save dir != stored hash || hash of TEMD != stored hash) - printout "Save file corrupted. Continue?" with prompt "Yes/No" - - Directory: - - +--- - --- 2a93bc5fd...f823 Actor data - --- 423bdc838...93bd Actor data - --- Items_list.txt Human-readable - --- Tiles_list.txt Human-readable - --- world save meta - --- worldinfo1 tileprop - --- worldinfo2 itemprop - --- worldinfo3 Roguelike randomiser - --- worldinfo4 TEMD binary diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Terrarum.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Terrarum.class deleted file mode 100644 index 1b42c9553..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Terrarum.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/TileProperties/TileNameCode.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/TileProperties/TileNameCode.class deleted file mode 100644 index 5a50aba8a..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/TileProperties/TileNameCode.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/TileProperties/TileProp.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/TileProperties/TileProp.class deleted file mode 100644 index 15189cb87..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/TileProperties/TileProp.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/TileProperties/TilePropCodex.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/TileProperties/TilePropCodex.class deleted file mode 100644 index 5f66a968d..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/TileProperties/TilePropCodex.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/TileProperties/tileprop.csv b/out/production/Terrarum_renewed/com/Torvald/Terrarum/TileProperties/tileprop.csv deleted file mode 100644 index cf3374aed..000000000 --- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/TileProperties/tileprop.csv +++ /dev/null @@ -1,134 +0,0 @@ - "id";"dmg";"name" ;"opacity";"strength";"dsty";"fluid";"movr";"solid";"wall";"lumcolor";"drop";"ddmg";"fall";"friction" - "0"; "0";"TILE_AIR" ; "1641"; "0"; "1"; "0"; "0"; "0"; "0"; "0"; "0"; "0"; "0";"16" - "1"; "0";"TILE_STONE" ; "8205"; "25";"2400"; "0"; "0"; "1"; "1"; "0"; "1"; "0"; "0";"16" - "1"; "1";"TILE_STONE_QUARRIED" ; "8205"; "25";"2400"; "0"; "0"; "1"; "1"; "0"; "1"; "1"; "0";"16" - "2"; "0";"TILE_DIRT" ; "8205"; "6";"1400"; "0"; "0"; "1"; "1"; "0"; "2"; "0"; "0";"16" - "2"; "1";"TILE_GRASS" ; "8205"; "6";"1400"; "0"; "0"; "1"; "1"; "0"; "2"; "1"; "0";"16" - "3"; "0";"TILE_PLANK_NORMAL" ; "8205"; "12"; "740"; "0"; "0"; "1"; "1"; "0"; "3"; "0"; "0";"16" - "3"; "1";"TILE_PLANK_EBONY" ; "8205"; "12";"1200"; "0"; "0"; "1"; "1"; "0"; "3"; "1"; "0";"16" - "3"; "2";"TILE_PLANK_BIRCH" ; "8205"; "12"; "670"; "0"; "0"; "1"; "1"; "0"; "3"; "2"; "0";"16" - "3"; "3";"TILE_PLANK_BLOODROSE" ; "8205"; "12"; "900"; "0"; "0"; "1"; "1"; "0"; "3"; "3"; "0";"16" - "4"; "0";"TILE_TRUNK_NORMAL" ; "8205"; "12"; "740"; "0"; "0"; "1"; "0"; "0"; "3"; "0"; "0";"16" - "4"; "1";"TILE_TRUNK_EBONY" ; "8205"; "12";"1200"; "0"; "0"; "1"; "0"; "0"; "3"; "1"; "0";"16" - "4"; "2";"TILE_TRUNK_BIRCH" ; "8205"; "12"; "670"; "0"; "0"; "1"; "0"; "0"; "3"; "2"; "0";"16" - "4"; "3";"TILE_TRUNK_BLOODROSE" ; "8205"; "12"; "900"; "0"; "0"; "1"; "0"; "0"; "3"; "3"; "0";"16" - "5"; "0";"TILE_SAND" ; "8205"; "6";"2400"; "0"; "0"; "1"; "0"; "0"; "5"; "0"; "1";"16" - "5"; "1";"TILE_SAND_WHITE" ; "8205"; "6";"2400"; "0"; "0"; "1"; "0"; "0"; "5"; "1"; "1";"16" - "5"; "2";"TILE_SAND_RED" ; "8205"; "6";"2400"; "0"; "0"; "1"; "0"; "0"; "5"; "2"; "1";"16" - "5"; "3";"TILE_SAND_DESERT" ; "8205"; "6";"2400"; "0"; "0"; "1"; "0"; "0"; "5"; "3"; "1";"16" - "5"; "4";"TILE_SAND_BLACK" ; "8205"; "6";"2400"; "0"; "0"; "1"; "0"; "0"; "5"; "4"; "1";"16" - "5"; "5";"TILE_SAND_GREEN" ; "8205"; "6";"2400"; "0"; "0"; "1"; "0"; "0"; "5"; "5"; "1";"16" - "6"; "0";"TILE_GRAVEL" ; "8205"; "6";"2400"; "0"; "0"; "1"; "0"; "0"; "6"; "0"; "1";"16" - "6"; "1";"TILE_GRAVEL_GREY" ; "8205"; "6";"2400"; "0"; "0"; "1"; "0"; "0"; "6"; "1"; "1";"16" - "7"; "0";"TILE_ORE_MALACHITE" ; "8205"; "25";"2400"; "0"; "0"; "1"; "0"; "0"; "7"; "0"; "0";"16" - "7"; "1";"TILE_ORE_HEMATITE" ; "8205"; "25";"2400"; "0"; "0"; "1"; "0"; "0"; "7"; "1"; "0";"16" - "7"; "2";"TILE_ORE_NATURAL_GOLD" ; "8205"; "25";"2400"; "0"; "0"; "1"; "0"; "0"; "7"; "2"; "0";"16" - "7"; "3";"TILE_ORE_NATURAL_SILVER" ; "8205"; "25";"2400"; "0"; "0"; "1"; "0"; "0"; "7"; "3"; "0";"16" - "7"; "4";"TILE_ORE_RUTILE" ; "8205"; "25";"2400"; "0"; "0"; "1"; "0"; "0"; "7"; "4"; "0";"16" - "7"; "5";"TILE_ORE_AURICHALCUMITE" ; "8205"; "25";"2400"; "0"; "0"; "1"; "0"; "0"; "7"; "5"; "0";"16" - "8"; "0";"TILE_GEM_RUBY" ; "8205"; "25";"2400"; "0"; "0"; "1"; "0"; "0"; "8"; "0"; "0";"16" - "8"; "1";"TILE_GEM_EMERALD" ; "8205"; "25";"2400"; "0"; "0"; "1"; "0"; "0"; "8"; "1"; "0";"16" - "8"; "2";"TILE_GEM_SAPPHIRE" ; "8205"; "25";"2400"; "0"; "0"; "1"; "0"; "0"; "8"; "2"; "0";"16" - "8"; "3";"TILE_GEM_TOPAZ" ; "8205"; "25";"2400"; "0"; "0"; "1"; "0"; "0"; "8"; "3"; "0";"16" - "8"; "4";"TILE_GEM_DIAMOND" ; "8205"; "25";"2400"; "0"; "0"; "1"; "0"; "0"; "8"; "4"; "0";"16" - "8"; "5";"TILE_GEM_AMETHYST" ; "8205"; "25";"2400"; "0"; "0"; "1"; "0"; "0"; "8"; "5"; "0";"16" - "9"; "0";"TILE_SNOW" ; "8205"; "6"; "500"; "0"; "0"; "1"; "1"; "0"; "9"; "0"; "0";"16" - "9"; "1";"TILE_ICE_FRAGILE" ; "3282"; "1"; "930"; "0"; "0"; "1"; "0"; "0"; "9"; "1"; "0";"16" - "9"; "2";"TILE_ICE_NATURAL" ; "6564"; "25"; "930"; "0"; "0"; "1"; "1"; "0"; "9"; "2"; "0"; "8" - "9"; "3";"TILE_ICE_CLEAR_MAGICAL" ; "8205"; "25";"3720"; "0"; "0"; "1"; "1"; "5009"; "9"; "3"; "0"; "8" - "10"; "0";"TILE_PLATFORM_STONE" ; "1641"; "1"; "N/A"; "0"; "0"; "0"; "0"; "0"; "10"; "0"; "0";"16" - "10"; "1";"TILE_PLATFORM_WOODEN" ; "1641"; "1"; "N/A"; "0"; "0"; "0"; "0"; "0"; "10"; "1"; "0";"16" - "10"; "2";"TILE_PLATFORM_EBONY" ; "1641"; "1"; "N/A"; "0"; "0"; "0"; "0"; "0"; "10"; "2"; "0";"16" - "10"; "3";"TILE_PLATFORM_BIRCH" ; "1641"; "1"; "N/A"; "0"; "0"; "0"; "0"; "0"; "10"; "3"; "0";"16" - "10"; "4";"TILE_PLATFORM_BLOODROSE" ; "1641"; "1"; "N/A"; "0"; "0"; "0"; "0"; "0"; "10"; "4"; "0";"16" - "11"; "0";"TILE_TORCH" ; "0"; "0"; "N/A"; "0"; "0"; "0"; "0"; "63412"; "11"; "0"; "0";"16" - "11"; "1";"TILE_TORCH_FROST" ; "0"; "0"; "N/A"; "0"; "0"; "0"; "0"; "19999"; "11"; "1"; "0";"16" - "12"; "0";"TILE_TORCH" ; "1641"; "0"; "N/A"; "0"; "0"; "0"; "0"; "0"; "11"; "0"; "0";"16" - "12"; "1";"TILE_TORCH_FROST" ; "1641"; "0"; "N/A"; "0"; "0"; "0"; "0"; "0"; "11"; "1"; "0";"16" - "13"; "0";"TILE_ILLUMINATOR_WHITE" ; "0"; "0"; "N/A"; "0"; "0"; "1"; "1"; "59076"; "13"; "0"; "0";"16" - "13"; "1";"TILE_ILLUMINATOR_YELLOW" ; "0"; "0"; "N/A"; "0"; "0"; "1"; "1"; "59040"; "13"; "1"; "0";"16" - "13"; "2";"TILE_ILLUMINATOR_ORANGE" ; "0"; "0"; "N/A"; "0"; "0"; "1"; "1"; "58720"; "13"; "2"; "0";"16" - "13"; "3";"TILE_ILLUMINATOR_RED" ; "0"; "0"; "N/A"; "0"; "0"; "1"; "1"; "57600"; "13"; "3"; "0";"16" - "13"; "4";"TILE_ILLUMINATOR_FUCHSIA" ; "0"; "0"; "N/A"; "0"; "0"; "1"; "1"; "57628"; "13"; "4"; "0";"16" - "13"; "5";"TILE_ILLUMINATOR_PURPLE" ; "0"; "0"; "N/A"; "0"; "0"; "1"; "1"; "44836"; "13"; "5"; "0";"16" - "13"; "6";"TILE_ILLUMINATOR_BLUE" ; "0"; "0"; "N/A"; "0"; "0"; "1"; "1"; "36"; "13"; "6"; "0";"16" - "13"; "7";"TILE_ILLUMINATOR_CYAN" ; "0"; "0"; "N/A"; "0"; "0"; "1"; "1"; "1276"; "13"; "7"; "0";"16" - "13"; "8";"TILE_ILLUMINATOR_GREEN" ; "0"; "0"; "N/A"; "0"; "0"; "1"; "1"; "17240"; "13"; "8"; "0";"16" - "13"; "9";"TILE_ILLUMINATOR_GREEN_DARK"; "0"; "0"; "N/A"; "0"; "0"; "1"; "1"; "8640"; "13"; "9"; "0";"16" - "13"; "10";"TILE_ILLUMINATOR_BROWN" ; "0"; "0"; "N/A"; "0"; "0"; "1"; "1"; "21000"; "13"; "10"; "0";"16" - "13"; "11";"TILE_ILLUMINATOR_TAN" ; "0"; "0"; "N/A"; "0"; "0"; "1"; "1"; "37448"; "13"; "11"; "0";"16" - "13"; "12";"TILE_ILLUMINATOR_GREY_LIGHT"; "0"; "0"; "N/A"; "0"; "0"; "1"; "1"; "47589"; "13"; "12"; "0";"16" - "13"; "13";"TILE_ILLUMINATOR_GREY_MED"; "0"; "0"; "N/A"; "0"; "0"; "1"; "1"; "29538"; "13"; "13"; "0";"16" - "13"; "14";"TILE_ILLUMINATOR_GREY_DARK"; "0"; "0"; "N/A"; "0"; "0"; "1"; "1"; "16410"; "13"; "14"; "0";"16" - "13"; "15";"TILE_ILLUMINATOR_BLACK" ; "0"; "0"; "N/A"; "0"; "0"; "1"; "1"; "27239"; "13"; "15"; "0";"16" - "14"; "0";"TILE_ILLUMINATOR_WHITE" ; "0"; "0"; "N/A"; "0"; "0"; "1"; "1"; "0"; "13"; "0"; "0";"16" - "14"; "1";"TILE_ILLUMINATOR_YELLOW" ; "0"; "0"; "N/A"; "0"; "0"; "1"; "1"; "0"; "13"; "1"; "0";"16" - "14"; "2";"TILE_ILLUMINATOR_ORANGE" ; "0"; "0"; "N/A"; "0"; "0"; "1"; "1"; "0"; "13"; "2"; "0";"16" - "14"; "3";"TILE_ILLUMINATOR_RED" ; "0"; "0"; "N/A"; "0"; "0"; "1"; "1"; "0"; "13"; "3"; "0";"16" - "14"; "4";"TILE_ILLUMINATOR_FUCHSIA" ; "0"; "0"; "N/A"; "0"; "0"; "1"; "1"; "0"; "13"; "4"; "0";"16" - "14"; "5";"TILE_ILLUMINATOR_PURPLE" ; "0"; "0"; "N/A"; "0"; "0"; "1"; "1"; "0"; "13"; "5"; "0";"16" - "14"; "6";"TILE_ILLUMINATOR_BLUE" ; "0"; "0"; "N/A"; "0"; "0"; "1"; "1"; "0"; "13"; "6"; "0";"16" - "14"; "7";"TILE_ILLUMINATOR_CYAN" ; "0"; "0"; "N/A"; "0"; "0"; "1"; "1"; "0"; "13"; "7"; "0";"16" - "14"; "8";"TILE_ILLUMINATOR_GREEN" ; "0"; "0"; "N/A"; "0"; "0"; "1"; "1"; "0"; "13"; "8"; "0";"16" - "14"; "9";"TILE_ILLUMINATOR_GREEN_DARK"; "0"; "0"; "N/A"; "0"; "0"; "1"; "1"; "0"; "13"; "9"; "0";"16" - "14"; "10";"TILE_ILLUMINATOR_BROWN" ; "0"; "0"; "N/A"; "0"; "0"; "1"; "1"; "0"; "13"; "10"; "0";"16" - "14"; "11";"TILE_ILLUMINATOR_TAN" ; "0"; "0"; "N/A"; "0"; "0"; "1"; "1"; "0"; "13"; "11"; "0";"16" - "14"; "12";"TILE_ILLUMINATOR_GREY_LIGHT"; "0"; "0"; "N/A"; "0"; "0"; "1"; "1"; "0"; "13"; "12"; "0";"16" - "14"; "13";"TILE_ILLUMINATOR_GREY_MED"; "0"; "0"; "N/A"; "0"; "0"; "1"; "1"; "0"; "13"; "13"; "0";"16" - "14"; "14";"TILE_ILLUMINATOR_GREY_DARK"; "0"; "0"; "N/A"; "0"; "0"; "1"; "1"; "0"; "13"; "14"; "0";"16" - "14"; "15";"TILE_ILLUMINATOR_BLACK" ; "0"; "0"; "N/A"; "0"; "0"; "1"; "1"; "0"; "13"; "15"; "0";"16" - "15"; "0";"TILE_SANDSTONE" ; "8205"; "25";"1900"; "0"; "0"; "1"; "1"; "0"; "15"; "0"; "0";"16" - "15"; "1";"TILE_SANDSTONE_WHITE" ; "8205"; "25";"1900"; "0"; "0"; "1"; "1"; "0"; "15"; "1"; "0";"16" - "15"; "2";"TILE_SANDSTONE_RED" ; "8205"; "25";"1900"; "0"; "0"; "1"; "1"; "0"; "15"; "2"; "0";"16" - "15"; "3";"TILE_SANDSTONE_DESERT" ; "8205"; "25";"1900"; "0"; "0"; "1"; "1"; "0"; "15"; "3"; "0";"16" - "15"; "4";"TILE_SANDSTONE_BLACK" ; "8205"; "25";"1900"; "0"; "0"; "1"; "1"; "0"; "15"; "4"; "0";"16" - "15"; "5";"TILE_SANDSTONE_BLACK" ; "8205"; "25";"1900"; "0"; "0"; "1"; "1"; "0"; "15"; "5"; "0";"16" -"254"; "0";"TILE_WATER" ; "6522"; "100";"1000"; "1"; "12"; "0"; "0"; "0"; "N/A"; "N/A"; "0";"16" -"254"; "1";"TILE_WATER" ; "6522"; "100";"1000"; "1"; "12"; "0"; "0"; "0"; "N/A"; "N/A"; "0";"16" -"254"; "2";"TILE_WATER" ; "6522"; "100";"1000"; "1"; "12"; "0"; "0"; "0"; "N/A"; "N/A"; "0";"16" -"254"; "3";"TILE_WATER" ; "6522"; "100";"1000"; "1"; "12"; "0"; "0"; "0"; "N/A"; "N/A"; "0";"16" -"254"; "4";"TILE_WATER" ; "6522"; "100";"1000"; "1"; "12"; "0"; "0"; "0"; "N/A"; "N/A"; "0";"16" -"254"; "5";"TILE_WATER" ; "6522"; "100";"1000"; "1"; "12"; "0"; "0"; "0"; "N/A"; "N/A"; "0";"16" -"254"; "6";"TILE_WATER" ; "6522"; "100";"1000"; "1"; "12"; "0"; "0"; "0"; "N/A"; "N/A"; "0";"16" -"254"; "7";"TILE_WATER" ; "6522"; "100";"1000"; "1"; "12"; "0"; "0"; "0"; "N/A"; "N/A"; "0";"16" -"254"; "8";"TILE_WATER" ; "6522"; "100";"1000"; "1"; "12"; "0"; "0"; "0"; "N/A"; "N/A"; "0";"16" -"254"; "9";"TILE_WATER" ; "6522"; "100";"1000"; "1"; "12"; "0"; "0"; "0"; "N/A"; "N/A"; "0";"16" -"254"; "10";"TILE_WATER" ; "6522"; "100";"1000"; "1"; "12"; "0"; "0"; "0"; "N/A"; "N/A"; "0";"16" -"254"; "11";"TILE_WATER" ; "6522"; "100";"1000"; "1"; "12"; "0"; "0"; "0"; "N/A"; "N/A"; "0";"16" -"254"; "12";"TILE_WATER" ; "6522"; "100";"1000"; "1"; "12"; "0"; "0"; "0"; "N/A"; "N/A"; "0";"16" -"254"; "13";"TILE_WATER" ; "6522"; "100";"1000"; "1"; "12"; "0"; "0"; "0"; "N/A"; "N/A"; "0";"16" -"254"; "14";"TILE_WATER" ; "6522"; "100";"1000"; "1"; "12"; "0"; "0"; "0"; "N/A"; "N/A"; "0";"16" -"254"; "15";"TILE_WATER" ; "6522"; "100";"1000"; "1"; "12"; "0"; "0"; "0"; "N/A"; "N/A"; "0";"16" -"255"; "0";"TILE_LAVA" ; "62358"; "100";"2600"; "1"; "48"; "0"; "0"; "48320"; "N/A"; "N/A"; "0";"16" -"255"; "1";"TILE_LAVA" ; "62358"; "100";"2600"; "1"; "48"; "0"; "0"; "48320"; "N/A"; "N/A"; "0";"16" -"255"; "2";"TILE_LAVA" ; "62358"; "100";"2600"; "1"; "48"; "0"; "0"; "48320"; "N/A"; "N/A"; "0";"16" -"255"; "3";"TILE_LAVA" ; "62358"; "100";"2600"; "1"; "48"; "0"; "0"; "48320"; "N/A"; "N/A"; "0";"16" -"255"; "4";"TILE_LAVA" ; "62358"; "100";"2600"; "1"; "48"; "0"; "0"; "48320"; "N/A"; "N/A"; "0";"16" -"255"; "5";"TILE_LAVA" ; "62358"; "100";"2600"; "1"; "48"; "0"; "0"; "48320"; "N/A"; "N/A"; "0";"16" -"255"; "6";"TILE_LAVA" ; "62358"; "100";"2600"; "1"; "48"; "0"; "0"; "48320"; "N/A"; "N/A"; "0";"16" -"255"; "7";"TILE_LAVA" ; "62358"; "100";"2600"; "1"; "48"; "0"; "0"; "48320"; "N/A"; "N/A"; "0";"16" -"255"; "8";"TILE_LAVA" ; "62358"; "100";"2600"; "1"; "48"; "0"; "0"; "48320"; "N/A"; "N/A"; "0";"16" -"255"; "9";"TILE_LAVA" ; "62358"; "100";"2600"; "1"; "48"; "0"; "0"; "48320"; "N/A"; "N/A"; "0";"16" -"255"; "10";"TILE_LAVA" ; "62358"; "100";"2600"; "1"; "48"; "0"; "0"; "48320"; "N/A"; "N/A"; "0";"16" -"255"; "11";"TILE_LAVA" ; "62358"; "100";"2600"; "1"; "48"; "0"; "0"; "48320"; "N/A"; "N/A"; "0";"16" -"255"; "12";"TILE_LAVA" ; "62358"; "100";"2600"; "1"; "48"; "0"; "0"; "48320"; "N/A"; "N/A"; "0";"16" -"255"; "13";"TILE_LAVA" ; "62358"; "100";"2600"; "1"; "48"; "0"; "0"; "48320"; "N/A"; "N/A"; "0";"16" -"255"; "14";"TILE_LAVA" ; "62358"; "100";"2600"; "1"; "48"; "0"; "0"; "48320"; "N/A"; "N/A"; "0";"16" -"255"; "15";"TILE_LAVA" ; "62358"; "100";"2600"; "1"; "48"; "0"; "0"; "48320"; "N/A"; "N/A"; "0";"16" -# Friction: 0: frictionless, <16: slippery, 16: regular, >16: sticky -# Opacity/Lumcolor: 40-step RGB -# Solid: whether the tile has full collision -# movr: Movement resistance, (walkspeedmax) / (1 + (n/16)), 16 halves movement speed -# dsty: density. As we are putting water an 1000, it is identical to specific gravity. [g/l] - -# Defalut torch should have a colour of 63412 (ffa44e) : real candlelight colour taken from properly configured camera. - -# 16 colour palette : Old Apple Macintosh 16-colour palette - -# Magical ice: theoretical __metallic__ ice that might form under super-high pressure (> 5 TPa). Its density is a wild guess. - -# Off illuminator: NO OPACITY! this is intended! - -# References: -# * Density of various woods : http://www.engineeringtoolbox.com/wood-density-d_40.html -# * Density of various phases of ice : http://www1.lsbu.ac.uk/water/ice_phases.html \ No newline at end of file diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/TileStat/TileStat.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/TileStat/TileStat.class deleted file mode 100644 index fb1caa180..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/TileStat/TileStat.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/UserInterface/BasicDebugInfoWindow b/out/production/Terrarum_renewed/com/Torvald/Terrarum/UserInterface/BasicDebugInfoWindow deleted file mode 100644 index 318abdc41..000000000 --- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/UserInterface/BasicDebugInfoWindow +++ /dev/null @@ -1,220 +0,0 @@ -package com.Torvald.Terrarum.UserInterface; - -import com.Torvald.Terrarum.Actors.PlayerDebugger; -import com.Torvald.Terrarum.Actors.Hitbox; -import com.Torvald.Terrarum.GameMap.PairedMapLayer; -import com.Torvald.Terrarum.LangPack.Lang; -import com.Torvald.Terrarum.MapDrawer.LightmapRenderer; -import com.Torvald.Terrarum.MapDrawer.MapDrawer; -import com.Torvald.Terrarum.Terrarum; -import com.Torvald.Terrarum.MapDrawer.MapCamera; -import org.newdawn.slick.Color; -import org.newdawn.slick.GameContainer; -import org.newdawn.slick.Graphics; -import org.newdawn.slick.Input; - -import java.util.Formatter; - -/** - * Created by minjaesong on 16-01-19. - */ -public class BasicDebugInfoWindow implements UICanvas { - - private static PlayerDebugger playerDbg; - - int width; - int height; - - /** - * Call AFTER player constuction! - */ - public BasicDebugInfoWindow() { - width = Terrarum.WIDTH; - height = Terrarum.HEIGHT; - } - - @Override - public void render(GameContainer gc, Graphics g) { - if (playerDbg == null) { - playerDbg = new PlayerDebugger(Terrarum.game.getPlayer()); - } - - - StringBuilder sb = new StringBuilder(); - Formatter formatter = new Formatter(sb); - - int mouseTileX = (int) ((MapCamera.getCameraX() + gc.getInput().getMouseX() / Terrarum.game.screenZoom) - / MapDrawer.TILE_SIZE); - int mouseTileY = (int) ((MapCamera.getCameraY() + gc.getInput().getMouseY() / Terrarum.game.screenZoom) - / MapDrawer.TILE_SIZE); - - g.setColor(Color.white); - - Hitbox hitbox = playerDbg.hitbox(); - Hitbox nextHitbox = playerDbg.nextHitbox(); - - printLine(g, 1, "posX : " - + String.valueOf(hitbox.getPointedX()) - + " (" - + String.valueOf((int) (hitbox.getPointedX() / MapDrawer.TILE_SIZE)) - + ")" - ); - printLine(g, 2, "posY : " - + String.valueOf(hitbox.getPointedY()) - + " (" - + String.valueOf((int) (hitbox.getPointedY() / MapDrawer.TILE_SIZE)) - + ")" - ); - printLine(g, 3, "veloX : " + String.valueOf(playerDbg.veloX())); - printLine(g, 4, "veloY : " + String.valueOf(playerDbg.veloY())); - printLine(g, 5, "grounded : " + String.valueOf(playerDbg.grounded())); - printLine(g, 6, "noClip : " + String.valueOf(playerDbg.noClip())); - printLine(g, 7, "mass : " + String.valueOf(playerDbg.mass()) + " [kg]"); - - String lightVal; - String mtX = String.valueOf(mouseTileX), mtY = String.valueOf(mouseTileY); - try { - char valRaw = LightmapRenderer.getValueFromMap(mouseTileX, mouseTileY); - int rawR = LightmapRenderer.getRawR(valRaw); - int rawG = LightmapRenderer.getRawG(valRaw); - int rawB = LightmapRenderer.getRawB(valRaw); - lightVal = String.valueOf((int)valRaw) + " (" - + String.valueOf(rawR) + " " - + String.valueOf(rawG) + " " - + String.valueOf(rawB) + ")"; - } - catch (ArrayIndexOutOfBoundsException e) { - lightVal = "out of bounds"; - mtX = "---"; - mtY = "---"; - } - printLine(g, 8, "light at cursor : " + lightVal - ); - - String tileNo; - try { - int tileNumRaw = Terrarum.game.map.getTileFromTerrain(mouseTileX, mouseTileY); - int tilenum = tileNumRaw / PairedMapLayer.RANGE; - int tiledmg = tileNumRaw % PairedMapLayer.RANGE; - tileNo = tilenum + ":" + tiledmg; - } - catch (ArrayIndexOutOfBoundsException e) { - tileNo = "-"; - } - printLine(g, 9, "tile : " + tileNo + " (" + mtX + ", " + mtY + ")"); - - /** - * Second column - */ - - int collisonFlag = playerDbg.eventMoving(); - printLineColumn(g, 2, 1, "Vsync : " + Terrarum.appgc.isVSyncRequested()); - printLineColumn(g, 2, 2, "Env colour temp : " + MapDrawer.getColTemp()); - - /** - * On screen - */ - - // Memory allocation - long memInUse = Terrarum.game.memInUse; - long totalVMMem = Terrarum.game.totalVMMem; - - g.setColor(new Color(0xFF7F00)); - g.drawString( - Lang.get("DEV_MEMORY_SHORT_CAP") - + " : " - + formatter.format( - Lang.get("DEV_MEMORY_A_OF_B") - , memInUse - , totalVMMem - ) - , Terrarum.WIDTH - 200, line(1) - ); - - // Hitbox - float zoom = Terrarum.game.screenZoom; - g.setColor(new Color(0x007f00)); - g.drawRect(hitbox.getHitboxStart().getX() * zoom - - MapCamera.getCameraX() * zoom - , hitbox.getHitboxStart().getY() * zoom - - MapCamera.getCameraY() * zoom - , hitbox.getWidth() * zoom - , hitbox.getHeight() * zoom - ); - // ...and its point - g.fillRect( - (hitbox.getPointedX() - 1) * zoom - - MapCamera.getCameraX() * zoom - , (hitbox.getPointedY() - 1) * zoom - - MapCamera.getCameraY() * zoom - , 3 - , 3 - ); - g.drawString( - Lang.get("DEV_COLOUR_LEGEND_GREEN") - + " : hitbox", Terrarum.WIDTH - 200 - , line(2) - ); - - // Next hitbox - g.setColor(Color.blue); - g.drawRect(nextHitbox.getHitboxStart().getX() * zoom - - MapCamera.getCameraX() * zoom - , nextHitbox.getHitboxStart().getY() * zoom - - MapCamera.getCameraY() * zoom - , nextHitbox.getWidth() * zoom - , nextHitbox.getHeight() * zoom - ); - // ...and its point - g.fillRect( - (nextHitbox.getPointedX() - 1) * zoom - - MapCamera.getCameraX() * zoom - , (nextHitbox.getPointedY() - 1) * zoom - - MapCamera.getCameraY() * zoom - , 3 - , 3 - ); - g.drawString( - Lang.get("DEV_COLOUR_LEGEND_BLUE") - + " : nextHitbox", Terrarum.WIDTH - 200 - , line(3) - ); - } - - private static void printLine(Graphics g, int l, String s) { - g.drawString(s, 20, line(l)); - } - - private static void printLineColumn(Graphics g, int col, int row, String s) { - g.drawString(s, 20 + column(col), line(row)); - } - - private static int line(int i) { - return i * 20; - } - - private static int column(int i) { - return (250 * (i - 1)); - } - - @Override - public void update(GameContainer gc, int delta_t) { - - } - - @Override - public void processInput(Input input) { - - } - - @Override - public int getWidth() { - return width; - } - - @Override - public int getHeight() { - return height; - } - -} diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/UserInterface/BasicDebugInfoWindow.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/UserInterface/BasicDebugInfoWindow.class deleted file mode 100644 index 2aa28ed5d..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/UserInterface/BasicDebugInfoWindow.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/UserInterface/ConsoleWindow.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/UserInterface/ConsoleWindow.class deleted file mode 100644 index 82bd85c96..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/UserInterface/ConsoleWindow.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/UserInterface/Message.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/UserInterface/Message.class deleted file mode 100644 index e0af42bd1..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/UserInterface/Message.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/UserInterface/Notification.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/UserInterface/Notification.class deleted file mode 100644 index 3468710e0..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/UserInterface/Notification.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/UserInterface/UICanvas b/out/production/Terrarum_renewed/com/Torvald/Terrarum/UserInterface/UICanvas deleted file mode 100644 index 8e296a46e..000000000 --- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/UserInterface/UICanvas +++ /dev/null @@ -1,24 +0,0 @@ -package com.Torvald.Terrarum.UserInterface; - -import org.newdawn.slick.GameContainer; -import org.newdawn.slick.Graphics; -import org.newdawn.slick.Input; - -import java.util.LinkedList; - -/** - * Created by minjaesong on 15-12-31.
- */ -public interface UICanvas { - - int getWidth(); - - int getHeight(); - - void update(GameContainer gc, int delta_t); - - void render(GameContainer gc, Graphics g); - - void processInput(Input input); - -} diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/UserInterface/UICanvas.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/UserInterface/UICanvas.class deleted file mode 100644 index 8fc3f3388..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/UserInterface/UICanvas.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/UserInterface/UIClickable b/out/production/Terrarum_renewed/com/Torvald/Terrarum/UserInterface/UIClickable deleted file mode 100644 index b4ef9a84e..000000000 --- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/UserInterface/UIClickable +++ /dev/null @@ -1,22 +0,0 @@ -package com.Torvald.Terrarum.UserInterface; - -/** - * Created by minjaesong on 16-03-06. - */ -public interface UIClickable { - - void mouseMoved(int oldx, int oldy, int newx, int newy); - - void mouseDragged(int oldx, int oldy, int newx, int newy); - - void mousePressed(int button, int x, int y); - - void mouseReleased(int button, int x, int y); - - void mouseWheelMoved(int change); - - void controllerButtonPressed(int controller, int button); - - void controllerButtonReleased(int controller, int button); - -} diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/UserInterface/UIClickable.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/UserInterface/UIClickable.class deleted file mode 100644 index ae8c04c28..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/UserInterface/UIClickable.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/UserInterface/UIHandler.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/UserInterface/UIHandler.class deleted file mode 100644 index 255355215..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/UserInterface/UIHandler.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/UserInterface/UIItem.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/UserInterface/UIItem.class deleted file mode 100644 index 0aef34b8e..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/UserInterface/UIItem.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/UserInterface/UITypable b/out/production/Terrarum_renewed/com/Torvald/Terrarum/UserInterface/UITypable deleted file mode 100644 index 9766ea95a..000000000 --- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/UserInterface/UITypable +++ /dev/null @@ -1,12 +0,0 @@ -package com.Torvald.Terrarum.UserInterface; - -/** - * Created by minjaesong on 16-03-06. - */ -public interface UITypable { - - void keyPressed(int key, char c); - - void keyReleased(int key, char c); - -} diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/UserInterface/UITypable.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/UserInterface/UITypable.class deleted file mode 100644 index d58fa4ada..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/UserInterface/UITypable.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/Torvald/spriteAnimation/SpriteAnimation.class b/out/production/Terrarum_renewed/com/Torvald/spriteAnimation/SpriteAnimation.class deleted file mode 100644 index cc514a046..000000000 Binary files a/out/production/Terrarum_renewed/com/Torvald/spriteAnimation/SpriteAnimation.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/jme3/math/FastMath.class b/out/production/Terrarum_renewed/com/jme3/math/FastMath.class deleted file mode 100644 index 587ff433b..000000000 Binary files a/out/production/Terrarum_renewed/com/jme3/math/FastMath.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/jme3/math/Vector2f.class b/out/production/Terrarum_renewed/com/jme3/math/Vector2f.class deleted file mode 100644 index 454ba59ed..000000000 Binary files a/out/production/Terrarum_renewed/com/jme3/math/Vector2f.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/jme3/math/Vector3f.class b/out/production/Terrarum_renewed/com/jme3/math/Vector3f.class deleted file mode 100644 index fe5edf3d9..000000000 Binary files a/out/production/Terrarum_renewed/com/jme3/math/Vector3f.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/Joise.class b/out/production/Terrarum_renewed/com/sudoplay/joise/Joise.class deleted file mode 100644 index 4a76eeee8..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/Joise.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/JoiseException.class b/out/production/Terrarum_renewed/com/sudoplay/joise/JoiseException.class deleted file mode 100644 index ed7d64d00..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/JoiseException.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/ModuleInstanceMap.class b/out/production/Terrarum_renewed/com/sudoplay/joise/ModuleInstanceMap.class deleted file mode 100644 index d2868defc..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/ModuleInstanceMap.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/ModuleMap.class b/out/production/Terrarum_renewed/com/sudoplay/joise/ModuleMap.class deleted file mode 100644 index 90edd36a8..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/ModuleMap.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/ModulePropertyMap.class b/out/production/Terrarum_renewed/com/sudoplay/joise/ModulePropertyMap.class deleted file mode 100644 index 2190f4c5e..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/ModulePropertyMap.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/generator/BasePRNG.class b/out/production/Terrarum_renewed/com/sudoplay/joise/generator/BasePRNG.class deleted file mode 100644 index dedf4c473..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/generator/BasePRNG.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/generator/CMWC4096.class b/out/production/Terrarum_renewed/com/sudoplay/joise/generator/CMWC4096.class deleted file mode 100644 index a4306c2f6..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/generator/CMWC4096.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/generator/KISS.class b/out/production/Terrarum_renewed/com/sudoplay/joise/generator/KISS.class deleted file mode 100644 index 1bb6323a2..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/generator/KISS.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/generator/LCG.class b/out/production/Terrarum_renewed/com/sudoplay/joise/generator/LCG.class deleted file mode 100644 index f1c00e371..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/generator/LCG.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/generator/MWC.class b/out/production/Terrarum_renewed/com/sudoplay/joise/generator/MWC.class deleted file mode 100644 index 9f3c9c0cb..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/generator/MWC.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/generator/MWC256.class b/out/production/Terrarum_renewed/com/sudoplay/joise/generator/MWC256.class deleted file mode 100644 index 48cd869b4..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/generator/MWC256.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/generator/XORShift.class b/out/production/Terrarum_renewed/com/sudoplay/joise/generator/XORShift.class deleted file mode 100644 index 389729ea1..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/generator/XORShift.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/mapping/Array2Double.class b/out/production/Terrarum_renewed/com/sudoplay/joise/mapping/Array2Double.class deleted file mode 100644 index c10654dd8..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/mapping/Array2Double.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/mapping/Array2DoubleWriter.class b/out/production/Terrarum_renewed/com/sudoplay/joise/mapping/Array2DoubleWriter.class deleted file mode 100644 index 78273f636..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/mapping/Array2DoubleWriter.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/mapping/Array3Double.class b/out/production/Terrarum_renewed/com/sudoplay/joise/mapping/Array3Double.class deleted file mode 100644 index b91efc3c5..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/mapping/Array3Double.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/mapping/Array3DoubleWriter.class b/out/production/Terrarum_renewed/com/sudoplay/joise/mapping/Array3DoubleWriter.class deleted file mode 100644 index 9b514deb4..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/mapping/Array3DoubleWriter.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/mapping/Mapping$1.class b/out/production/Terrarum_renewed/com/sudoplay/joise/mapping/Mapping$1.class deleted file mode 100644 index 40e8022de..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/mapping/Mapping$1.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/mapping/Mapping.class b/out/production/Terrarum_renewed/com/sudoplay/joise/mapping/Mapping.class deleted file mode 100644 index 586cac35c..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/mapping/Mapping.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/mapping/Mapping2DWriter$1.class b/out/production/Terrarum_renewed/com/sudoplay/joise/mapping/Mapping2DWriter$1.class deleted file mode 100644 index bd38e37b0..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/mapping/Mapping2DWriter$1.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/mapping/Mapping2DWriter.class b/out/production/Terrarum_renewed/com/sudoplay/joise/mapping/Mapping2DWriter.class deleted file mode 100644 index f96461779..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/mapping/Mapping2DWriter.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/mapping/Mapping3DWriter$1.class b/out/production/Terrarum_renewed/com/sudoplay/joise/mapping/Mapping3DWriter$1.class deleted file mode 100644 index 6aa2be9eb..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/mapping/Mapping3DWriter$1.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/mapping/Mapping3DWriter.class b/out/production/Terrarum_renewed/com/sudoplay/joise/mapping/Mapping3DWriter.class deleted file mode 100644 index 5943baf3b..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/mapping/Mapping3DWriter.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/mapping/MappingMode.class b/out/production/Terrarum_renewed/com/sudoplay/joise/mapping/MappingMode.class deleted file mode 100644 index 3c9543940..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/mapping/MappingMode.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/mapping/MappingRange.class b/out/production/Terrarum_renewed/com/sudoplay/joise/mapping/MappingRange.class deleted file mode 100644 index 0b6f189b6..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/mapping/MappingRange.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/mapping/MappingUpdateListener$1.class b/out/production/Terrarum_renewed/com/sudoplay/joise/mapping/MappingUpdateListener$1.class deleted file mode 100644 index b67d557b7..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/mapping/MappingUpdateListener$1.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/mapping/MappingUpdateListener.class b/out/production/Terrarum_renewed/com/sudoplay/joise/mapping/MappingUpdateListener.class deleted file mode 100644 index 0a9bbb7f1..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/mapping/MappingUpdateListener.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/module/Module.class b/out/production/Terrarum_renewed/com/sudoplay/joise/module/Module.class deleted file mode 100644 index d5fa3d7a5..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/module/Module.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleAbs.class b/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleAbs.class deleted file mode 100644 index 1286273c0..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleAbs.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleAutoCorrect.class b/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleAutoCorrect.class deleted file mode 100644 index 631cf0858..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleAutoCorrect.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleBasisFunction$1.class b/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleBasisFunction$1.class deleted file mode 100644 index a58672d48..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleBasisFunction$1.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleBasisFunction$BasisType.class b/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleBasisFunction$BasisType.class deleted file mode 100644 index 786515c15..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleBasisFunction$BasisType.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleBasisFunction$InterpolationType.class b/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleBasisFunction$InterpolationType.class deleted file mode 100644 index a2d61b2e0..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleBasisFunction$InterpolationType.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleBasisFunction.class b/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleBasisFunction.class deleted file mode 100644 index 0bcc803a5..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleBasisFunction.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleBias.class b/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleBias.class deleted file mode 100644 index f90e4598a..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleBias.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleBlend.class b/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleBlend.class deleted file mode 100644 index 83fcce078..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleBlend.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleBrightContrast.class b/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleBrightContrast.class deleted file mode 100644 index a1c8d9687..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleBrightContrast.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleCache$Cache.class b/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleCache$Cache.class deleted file mode 100644 index e8ed2d1f1..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleCache$Cache.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleCache.class b/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleCache.class deleted file mode 100644 index 158561200..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleCache.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleCellGen$CellularCache.class b/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleCellGen$CellularCache.class deleted file mode 100644 index 56da129b6..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleCellGen$CellularCache.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleCellGen.class b/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleCellGen.class deleted file mode 100644 index 969eff838..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleCellGen.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleCellular.class b/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleCellular.class deleted file mode 100644 index ebaddf104..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleCellular.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleClamp.class b/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleClamp.class deleted file mode 100644 index 836abea45..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleClamp.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleCombiner$1.class b/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleCombiner$1.class deleted file mode 100644 index fcfbb9c27..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleCombiner$1.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleCombiner$CombinerType.class b/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleCombiner$CombinerType.class deleted file mode 100644 index fa1245321..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleCombiner$CombinerType.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleCombiner.class b/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleCombiner.class deleted file mode 100644 index 6fb1f7b7b..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleCombiner.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleCos.class b/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleCos.class deleted file mode 100644 index bf88f76f8..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleCos.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleFloor.class b/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleFloor.class deleted file mode 100644 index b3e5231ce..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleFloor.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleFractal$1.class b/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleFractal$1.class deleted file mode 100644 index c43da4393..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleFractal$1.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleFractal$FractalType.class b/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleFractal$FractalType.class deleted file mode 100644 index 24a7f8f63..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleFractal$FractalType.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleFractal.class b/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleFractal.class deleted file mode 100644 index 20908a383..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleFractal.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleFunctionGradient$1.class b/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleFunctionGradient$1.class deleted file mode 100644 index 490d8dd6d..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleFunctionGradient$1.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleFunctionGradient$FunctionGradientAxis.class b/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleFunctionGradient$FunctionGradientAxis.class deleted file mode 100644 index b6350a3ff..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleFunctionGradient$FunctionGradientAxis.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleFunctionGradient.class b/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleFunctionGradient.class deleted file mode 100644 index 498e979ca..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleFunctionGradient.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleGain.class b/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleGain.class deleted file mode 100644 index 35d9f052a..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleGain.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleGradient.class b/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleGradient.class deleted file mode 100644 index 3dde884f1..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleGradient.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleInvert.class b/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleInvert.class deleted file mode 100644 index d64d4fda2..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleInvert.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleMagnitude.class b/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleMagnitude.class deleted file mode 100644 index 7d43420ad..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleMagnitude.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleNormalizedCoords.class b/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleNormalizedCoords.class deleted file mode 100644 index a89247825..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleNormalizedCoords.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModulePow.class b/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModulePow.class deleted file mode 100644 index 6f94aa6a5..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModulePow.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleRotateDomain.class b/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleRotateDomain.class deleted file mode 100644 index 13b3d79fe..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleRotateDomain.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleSawtooth.class b/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleSawtooth.class deleted file mode 100644 index 597b201ea..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleSawtooth.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleScaleDomain.class b/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleScaleDomain.class deleted file mode 100644 index d8b292347..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleScaleDomain.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleScaleOffset.class b/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleScaleOffset.class deleted file mode 100644 index 1649a939b..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleScaleOffset.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleSelect.class b/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleSelect.class deleted file mode 100644 index d04374089..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleSelect.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleSin.class b/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleSin.class deleted file mode 100644 index 25dea0243..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleSin.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleSphere.class b/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleSphere.class deleted file mode 100644 index 6c70d7958..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleSphere.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleTiers.class b/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleTiers.class deleted file mode 100644 index c382a8e97..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleTiers.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleTranslateDomain.class b/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleTranslateDomain.class deleted file mode 100644 index c9bda690b..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleTranslateDomain.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleTriangle.class b/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleTriangle.class deleted file mode 100644 index e7f3d8cfe..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ModuleTriangle.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ScalarParameter.class b/out/production/Terrarum_renewed/com/sudoplay/joise/module/ScalarParameter.class deleted file mode 100644 index d9a5d28dd..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/module/ScalarParameter.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/module/SeedableModule.class b/out/production/Terrarum_renewed/com/sudoplay/joise/module/SeedableModule.class deleted file mode 100644 index 7e5532173..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/module/SeedableModule.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/module/SourcedModule.class b/out/production/Terrarum_renewed/com/sudoplay/joise/module/SourcedModule.class deleted file mode 100644 index c1618d0b4..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/module/SourcedModule.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Interpolator$1.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Interpolator$1.class deleted file mode 100644 index 0843a7469..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Interpolator$1.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Interpolator$2.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Interpolator$2.class deleted file mode 100644 index 384c65a6b..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Interpolator$2.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Interpolator$3.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Interpolator$3.class deleted file mode 100644 index 996538263..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Interpolator$3.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Interpolator$4.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Interpolator$4.class deleted file mode 100644 index ac6ce830c..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Interpolator$4.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Interpolator.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Interpolator.class deleted file mode 100644 index 30e1db0c3..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Interpolator.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$1.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$1.class deleted file mode 100644 index 942588380..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$1.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$2.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$2.class deleted file mode 100644 index 77cb9da39..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$2.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$3.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$3.class deleted file mode 100644 index df2940396..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$3.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$4.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$4.class deleted file mode 100644 index aa547c890..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$4.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$5.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$5.class deleted file mode 100644 index ed2646c04..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$5.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$6.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$6.class deleted file mode 100644 index e19686377..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$6.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function2D$1.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function2D$1.class deleted file mode 100644 index a24ec7e4c..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function2D$1.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function2D$2.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function2D$2.class deleted file mode 100644 index 4cb2dcdf9..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function2D$2.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function2D$3.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function2D$3.class deleted file mode 100644 index bb7b2d222..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function2D$3.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function2D$4.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function2D$4.class deleted file mode 100644 index cb33bdef0..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function2D$4.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function2D$5.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function2D$5.class deleted file mode 100644 index 1a06de70b..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function2D$5.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function2D.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function2D.class deleted file mode 100644 index 5f1f8ce7c..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function2D.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function3D$1.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function3D$1.class deleted file mode 100644 index a41a118bb..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function3D$1.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function3D$2.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function3D$2.class deleted file mode 100644 index 4360efa8c..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function3D$2.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function3D$3.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function3D$3.class deleted file mode 100644 index c2900a294..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function3D$3.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function3D$4.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function3D$4.class deleted file mode 100644 index 80108c617..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function3D$4.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function3D$5.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function3D$5.class deleted file mode 100644 index 408f1ede9..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function3D$5.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function3D.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function3D.class deleted file mode 100644 index e6d1072ed..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function3D.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function4D$1.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function4D$1.class deleted file mode 100644 index c0165ddaf..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function4D$1.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function4D$2.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function4D$2.class deleted file mode 100644 index 535b4bffe..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function4D$2.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function4D$3.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function4D$3.class deleted file mode 100644 index c0f73e4f1..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function4D$3.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function4D$4.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function4D$4.class deleted file mode 100644 index a8a534714..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function4D$4.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function4D$5.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function4D$5.class deleted file mode 100644 index 0df3cf8d2..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function4D$5.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function4D.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function4D.class deleted file mode 100644 index c03ba4fb4..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function4D.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function6D$1.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function6D$1.class deleted file mode 100644 index 420c6a935..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function6D$1.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function6D$2.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function6D$2.class deleted file mode 100644 index 417771b79..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function6D$2.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function6D$3.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function6D$3.class deleted file mode 100644 index 0333c6072..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function6D$3.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function6D$4.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function6D$4.class deleted file mode 100644 index 3610211f4..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function6D$4.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function6D$5.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function6D$5.class deleted file mode 100644 index 6f28f2211..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function6D$5.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function6D.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function6D.class deleted file mode 100644 index e12a4397f..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$Function6D.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$SVectorOrdering.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$SVectorOrdering.class deleted file mode 100644 index 5b43af2b1..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$SVectorOrdering.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$WorkerNoise2$1.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$WorkerNoise2$1.class deleted file mode 100644 index 514543aa5..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$WorkerNoise2$1.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$WorkerNoise2$2.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$WorkerNoise2$2.class deleted file mode 100644 index 1f704827c..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$WorkerNoise2$2.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$WorkerNoise2.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$WorkerNoise2.class deleted file mode 100644 index e9e5e59de..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$WorkerNoise2.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$WorkerNoise3$1.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$WorkerNoise3$1.class deleted file mode 100644 index d674de942..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$WorkerNoise3$1.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$WorkerNoise3$2.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$WorkerNoise3$2.class deleted file mode 100644 index 2013afbbf..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$WorkerNoise3$2.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$WorkerNoise3.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$WorkerNoise3.class deleted file mode 100644 index a49cc7f6f..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$WorkerNoise3.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$WorkerNoise4$1.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$WorkerNoise4$1.class deleted file mode 100644 index 371de2578..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$WorkerNoise4$1.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$WorkerNoise4$2.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$WorkerNoise4$2.class deleted file mode 100644 index 00b4417de..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$WorkerNoise4$2.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$WorkerNoise4.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$WorkerNoise4.class deleted file mode 100644 index e6bf1008d..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$WorkerNoise4.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$WorkerNoise6$1.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$WorkerNoise6$1.class deleted file mode 100644 index 81938b8a7..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$WorkerNoise6$1.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$WorkerNoise6$2.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$WorkerNoise6$2.class deleted file mode 100644 index 00778dea4..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$WorkerNoise6$2.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$WorkerNoise6.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$WorkerNoise6.class deleted file mode 100644 index 2b241626e..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise$WorkerNoise6.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise.class deleted file mode 100644 index 6d9b07081..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Noise.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/NoiseLUT.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/NoiseLUT.class deleted file mode 100644 index 451efd5ca..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/NoiseLUT.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Util$Vector3d.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Util$Vector3d.class deleted file mode 100644 index be0c4aaa7..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Util$Vector3d.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Util.class b/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Util.class deleted file mode 100644 index 0b94f7e64..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/joise/noise/Util.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/util/Assert.class b/out/production/Terrarum_renewed/com/sudoplay/util/Assert.class deleted file mode 100644 index a0bce8220..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/util/Assert.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/com/sudoplay/util/Checked.class b/out/production/Terrarum_renewed/com/sudoplay/util/Checked.class deleted file mode 100644 index 45efe87c5..000000000 Binary files a/out/production/Terrarum_renewed/com/sudoplay/util/Checked.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/shader/MultiTex.class b/out/production/Terrarum_renewed/shader/MultiTex.class deleted file mode 100644 index 7d4dfd167..000000000 Binary files a/out/production/Terrarum_renewed/shader/MultiTex.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/shader/Shader.class b/out/production/Terrarum_renewed/shader/Shader.class deleted file mode 100644 index f133d0fa2..000000000 Binary files a/out/production/Terrarum_renewed/shader/Shader.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/shader/ShaderResourceManager.class b/out/production/Terrarum_renewed/shader/ShaderResourceManager.class deleted file mode 100644 index 2c24f4d32..000000000 Binary files a/out/production/Terrarum_renewed/shader/ShaderResourceManager.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/shader/ShaderResourceManagerImpl.class b/out/production/Terrarum_renewed/shader/ShaderResourceManagerImpl.class deleted file mode 100644 index 9f974fa82..000000000 Binary files a/out/production/Terrarum_renewed/shader/ShaderResourceManagerImpl.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/shader/ShaderVariable$Qualifier.class b/out/production/Terrarum_renewed/shader/ShaderVariable$Qualifier.class deleted file mode 100644 index 06a30cd4e..000000000 Binary files a/out/production/Terrarum_renewed/shader/ShaderVariable$Qualifier.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/shader/ShaderVariable$Type.class b/out/production/Terrarum_renewed/shader/ShaderVariable$Type.class deleted file mode 100644 index 4bb9352e4..000000000 Binary files a/out/production/Terrarum_renewed/shader/ShaderVariable$Type.class and /dev/null differ diff --git a/out/production/Terrarum_renewed/shader/ShaderVariable.class b/out/production/Terrarum_renewed/shader/ShaderVariable.class deleted file mode 100644 index 3088ac821..000000000 Binary files a/out/production/Terrarum_renewed/shader/ShaderVariable.class and /dev/null differ