mirror of
https://github.com/MineLittlePony/MineLittlePony.git
synced 2024-11-22 04:27:59 +01:00
Happy April Fools!
This commit is contained in:
parent
f149191908
commit
d91d704800
13 changed files with 157 additions and 89 deletions
|
@ -26,6 +26,7 @@ public class Checkbox extends GuiCheckbox implements IGuiTooltipped<Checkbox> {
|
|||
super(0, x, y, I18n.format(displayString));
|
||||
action = callback;
|
||||
checked = value;
|
||||
enabled = false;
|
||||
}
|
||||
|
||||
public void perform() {
|
||||
|
|
|
@ -566,6 +566,8 @@ public class GuiSkins extends GameGui implements ISkinUploadHandler {
|
|||
|
||||
public FeatureSwitch(int x, int y, IGuiAction<? extends IconicButton> callback) {
|
||||
super(x, y, callback);
|
||||
|
||||
setLocked(true);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -586,8 +588,8 @@ public class GuiSkins extends GameGui implements ISkinUploadHandler {
|
|||
}
|
||||
|
||||
public void setLocked(boolean lock) {
|
||||
locked = lock;
|
||||
enabled &= !lock;
|
||||
locked = true;
|
||||
enabled = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,31 +1,31 @@
|
|||
#HD Skins en_US.lang file
|
||||
|
||||
hdskins.choose=Choose a file
|
||||
hdskins.manager=Skin Manager
|
||||
hdskins.choose=Choose a duck
|
||||
hdskins.manager=Duck Manager
|
||||
hdskins.error.unreadable=File not readable
|
||||
hdskins.error.ext=File not PNG
|
||||
hdskins.error.open=Error opening skin file
|
||||
hdskins.error.invalid=Not a valid skin file
|
||||
hdskins.error.select=Please select a skin first
|
||||
hdskins.error.mojang=Mojang API Error
|
||||
hdskins.error.mojang.wait=Please wait %d minutes
|
||||
hdskins.error.open=Error opening duck
|
||||
hdskins.error.invalid=Not a valid duck
|
||||
hdskins.error.select=Please select a duck first
|
||||
hdskins.error.mojang=Not Disney Licensed
|
||||
hdskins.error.mojang.wait=Contacting FBI
|
||||
hdskins.error.noserver=There was no valid skin server available
|
||||
hdskins.error.offline=- Server Offline -
|
||||
|
||||
hdskins.open.title=Choose skin
|
||||
hdskins.open.title=Choose duck
|
||||
hdskins.save.title=Choose save location
|
||||
hdskins.fetch=Fetching skin...
|
||||
hdskins.failed=Uploading skin failed
|
||||
hdskins.fetch=Verifying Identity...
|
||||
hdskins.failed=Uploading duck failed
|
||||
hdskins.request=Sending request to server please wait...
|
||||
hdskins.upload=Uploading skin please wait...
|
||||
hdskins.upload=Uploading duck please wait...
|
||||
|
||||
hdskins.local=Local Skin
|
||||
hdskins.server=Server Skin
|
||||
hdskins.local=Local Duck
|
||||
hdskins.server=Corporate Duck
|
||||
|
||||
hdskins.mode.steve=Steve Model
|
||||
hdskins.mode.alex=Alex Model
|
||||
hdskins.mode.steve=Duck Model
|
||||
hdskins.mode.alex=Ducky Model
|
||||
|
||||
hdskins.mode.skin=Player Texture
|
||||
hdskins.mode.skin=Duck Texture
|
||||
hdskins.mode.cape=Cape Texture
|
||||
hdskins.mode.elytra=Elytra Texture
|
||||
|
||||
|
@ -34,17 +34,17 @@ hdskins.mode.sleep=Sleeping
|
|||
hdskins.mode.ride=Riding
|
||||
|
||||
hdskins.options.chevy=>>
|
||||
hdskins.options.chevy.title=Upload Skin
|
||||
hdskins.options.chevy.title=Upload Duck
|
||||
hdskins.options.download=<<
|
||||
hdskins.options.download.title=Save Skin
|
||||
hdskins.options.download.title=Save Duck
|
||||
|
||||
hdskins.options.close=Close
|
||||
hdskins.options.clear=Clear
|
||||
hdskins.options.browse=Browse
|
||||
|
||||
hdskins.options.skindrops=Experimental Skin Drop
|
||||
hdskins.options.cache=Clear Skin Cache
|
||||
hdskins.options.skindrops=Experimental Duck Drop
|
||||
hdskins.options.cache=Drain Pond
|
||||
|
||||
hdskins.warning.experimental=§6WARNING: This feature is §4experimental§6, meaning things may break or derp or even slurp. Enabling this means you accept responsibility for what may happen to your chickens.
|
||||
hdskins.warning.disabled.title=§c%s %s
|
||||
hdskins.warning.disabled.description=§4(DISABLED)\n§7This feature is not supported by your current skin server.\n§7Please choose a different one to proceed.
|
||||
hdskins.warning.disabled.description=§4(DISABLED)\n§7Feature locked by Disney.
|
||||
|
|
|
@ -31,16 +31,16 @@ import org.lwjgl.input.Keyboard;
|
|||
*/
|
||||
public class MineLittlePony {
|
||||
|
||||
public static final Logger logger = LogManager.getLogger("MineLittlePony");
|
||||
public static final Logger logger = LogManager.getLogger("MineBiggestDucky");
|
||||
|
||||
public static final String MOD_NAME = "Mine Little Pony";
|
||||
public static final String MOD_NAME = "Mine Biggest Ducky";
|
||||
public static final String MOD_VERSION = "@VERSION@";
|
||||
|
||||
private static final String MINELP_VALHALLA_SERVER = "http://skins.minelittlepony-mod.com";
|
||||
private static final String MINELP_LEGACY_SERVER = "http://minelpskins.voxelmodpack.com";
|
||||
private static final String MINELP_LEGACY_GATEWAY = "http://minelpskinmanager.voxelmodpack.com";
|
||||
private static final String MINELP_VALHALLA_SERVER = "http://skins.minebiggestducky-mod.com";
|
||||
private static final String MINELP_LEGACY_SERVER = "http://ducktails.disney.com";
|
||||
private static final String MINELP_LEGACY_GATEWAY = "http://ducktails.disney.com";
|
||||
|
||||
private static final KeyBinding SETTINGS_GUI = new KeyBinding("Settings", Keyboard.KEY_F9, "Mine Little Pony");
|
||||
private static final KeyBinding SETTINGS_GUI = new KeyBinding("Settings", Keyboard.KEY_F9, "Mine Biggest Ducky");
|
||||
|
||||
private static MineLittlePony instance;
|
||||
|
||||
|
|
|
@ -8,7 +8,6 @@ import com.minelittlepony.settings.SensibleConfig;
|
|||
import com.mumfrey.liteloader.modconfig.ConfigStrategy;
|
||||
import com.mumfrey.liteloader.modconfig.Exposable;
|
||||
import com.mumfrey.liteloader.modconfig.ExposableOptions;
|
||||
import com.voxelmodpack.hdskins.HDSkinManager;
|
||||
|
||||
/**
|
||||
* Storage container for MineLP client settings.
|
||||
|
@ -59,10 +58,7 @@ public class PonyConfig extends SensibleConfig implements Exposable {
|
|||
* Actually gets the pony level value. No option to ignore reality here.
|
||||
*/
|
||||
public PonyLevel getPonyLevel() {
|
||||
if (ponylevel == null) {
|
||||
ponylevel = PonyLevel.PONIES;
|
||||
}
|
||||
return ponylevel;
|
||||
return PonyLevel.PONIES;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -72,10 +68,10 @@ public class PonyConfig extends SensibleConfig implements Exposable {
|
|||
*/
|
||||
public void setPonyLevel(PonyLevel ponylevel) {
|
||||
// only trigger reloads when the value actually changes
|
||||
if (ponylevel != this.ponylevel) {
|
||||
/*if (ponylevel != this.ponylevel) {
|
||||
this.ponylevel = ponylevel;
|
||||
HDSkinManager.INSTANCE.parseSkins();
|
||||
}
|
||||
}*/
|
||||
}
|
||||
|
||||
public void setGlobalScaleFactor(float f) {
|
||||
|
|
|
@ -3,6 +3,7 @@ package com.minelittlepony.model;
|
|||
import com.minelittlepony.MineLittlePony;
|
||||
import com.minelittlepony.model.armour.IEquestrianArmor;
|
||||
import com.minelittlepony.model.capabilities.IModelWrapper;
|
||||
import com.minelittlepony.model.ponies.ModelFools;
|
||||
import com.minelittlepony.pony.data.IPonyData;
|
||||
|
||||
/**
|
||||
|
@ -20,9 +21,9 @@ public class ModelWrapper implements IModelWrapper {
|
|||
* Creates a new model wrapper to contain the given pony.
|
||||
*/
|
||||
ModelWrapper(AbstractPonyModel model) {
|
||||
body = model;
|
||||
armor = model.createArmour();
|
||||
armor.apply(model.getMetadata());
|
||||
body = new ModelFools(false);
|
||||
armor = body.createArmour();
|
||||
armor.apply(body.getMetadata());
|
||||
|
||||
try {
|
||||
init();
|
||||
|
|
|
@ -0,0 +1,61 @@
|
|||
package com.minelittlepony.model.ponies;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.model.ModelChicken;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.texture.TextureManager;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import com.minelittlepony.model.AbstractPonyModel;
|
||||
import com.minelittlepony.model.BodyPart;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
public class ModelFools extends AbstractPonyModel {
|
||||
|
||||
private static final ResourceLocation CHICKEN_TEXTURES = new ResourceLocation("textures/entity/chicken.png");
|
||||
|
||||
private ModelChicken chicken = new ModelChicken();
|
||||
|
||||
public ModelFools(boolean arms) {
|
||||
super(arms);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void init(float y, float scale) {
|
||||
chicken = new ModelChicken();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void render(Entity entity, float move, float swing, float ticks, float headYaw, float headPitch, float scale) {
|
||||
|
||||
GlStateManager.pushMatrix();
|
||||
transform(BodyPart.BODY);
|
||||
GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS);
|
||||
|
||||
GlStateManager.scale(4, 4, 4);
|
||||
GlStateManager.translate(0, -1.15F, 0);
|
||||
|
||||
long factor = entity.getUniqueID().getMostSignificantBits();
|
||||
Random rand = new Random(factor);
|
||||
|
||||
GlStateManager.color(rand.nextFloat(), rand.nextFloat(), rand.nextFloat());
|
||||
|
||||
TextureManager tex = Minecraft.getMinecraft().getRenderManager().renderEngine;
|
||||
tex.bindTexture(CHICKEN_TEXTURES);
|
||||
|
||||
chicken.render(entity, move, swing, ticks, headYaw, headPitch, scale);
|
||||
|
||||
GL11.glPopAttrib();
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setRotationAngles(float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scaleFactor, Entity entityIn) {
|
||||
chicken.setRotationAngles(limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scaleFactor, entityIn);
|
||||
}
|
||||
|
||||
}
|
|
@ -40,7 +40,7 @@ public class LayerGear<T extends EntityLivingBase> extends AbstractPonyLayer<T>
|
|||
@Override
|
||||
protected void doPonyRender(T entity, float move, float swing, float partialTicks, float ticks, float headYaw, float headPitch, float scale) {
|
||||
|
||||
if (entity.isInvisible()) {
|
||||
if (entity.isInvisible() || true) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
@ -34,6 +34,8 @@ public class LayerPonyArmor<T extends EntityLivingBase> extends AbstractPonyLaye
|
|||
|
||||
@Override
|
||||
public void doPonyRender(T entity, float move, float swing, float partialTicks, float ticks, float headYaw, float headPitch, float scale) {
|
||||
if (true) return;
|
||||
|
||||
pony = getPonyRenderer().getModelWrapper();
|
||||
|
||||
for (EntityEquipmentSlot i : EntityEquipmentSlot.values()) {
|
||||
|
|
|
@ -68,9 +68,14 @@ public enum MobRenderers implements Setting {
|
|||
}
|
||||
};
|
||||
|
||||
@Override
|
||||
public boolean get() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void set(boolean value) {
|
||||
Setting.super.set(value);
|
||||
value = true;
|
||||
apply(MineLittlePony.getInstance().getRenderManager(), Minecraft.getMinecraft().getRenderManager());
|
||||
}
|
||||
|
||||
|
@ -78,9 +83,9 @@ public enum MobRenderers implements Setting {
|
|||
boolean state = get();
|
||||
register(state, pony, manager);
|
||||
if (state) {
|
||||
MineLittlePony.logger.info(name() + " are now ponies.");
|
||||
MineLittlePony.logger.info(name() + " are now ducks.");
|
||||
} else {
|
||||
MineLittlePony.logger.info(name() + " are no longer ponies.");
|
||||
MineLittlePony.logger.info(name() + " are no longer ducks.");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1,34 +1,34 @@
|
|||
minelp.options.title=Mine Little Pony Settings
|
||||
minelp.options.ponylevel=Pony Level
|
||||
minelp.options.ponylevel.ponies=Ponies Only
|
||||
minelp.options.ponylevel.humans=Humans Only
|
||||
minelp.options.ponylevel.both=Both
|
||||
minelp.options.options=Pony Options
|
||||
minelp.options.hd=Enable MineLP skin server
|
||||
minelp.options.sizes=Allow all different sizes of pony
|
||||
minelp.options.snuzzles=Display snuzzles on ponies
|
||||
minelp.options.showscale=Use show-accurate scaling
|
||||
minelp.options.fpsmagic=Ponies use magic in first-person
|
||||
minelp.options.ponyskulls=Render mob heads as ponies
|
||||
minelp.options.title=Mine Biggest Ducky Settings
|
||||
minelp.options.ponylevel=Quackyness
|
||||
minelp.options.ponylevel.ponies=Ducks Only
|
||||
minelp.options.ponylevel.humans=Ducks Only
|
||||
minelp.options.ponylevel.both=Ducks Only
|
||||
minelp.options.options=Duck Options
|
||||
minelp.options.hd=Enable MineBD skin server
|
||||
minelp.options.sizes=Allow all different sizes of duck
|
||||
minelp.options.snuzzles=Display bills on ducks
|
||||
minelp.options.showscale=Use disney-accurate scaling
|
||||
minelp.options.fpsmagic=Ducks use magic in first-person
|
||||
minelp.options.ponyskulls=Render mob heads as ducks
|
||||
minelp.options.frustrum=Enable Frustum checks
|
||||
|
||||
minelp.mobs.title=Mob Settings
|
||||
minelp.mobs.villagers=Ponify villagers
|
||||
minelp.mobs.zombies=Ponify zombies
|
||||
minelp.mobs.pigzombies=Ponify zombie pigmen
|
||||
minelp.mobs.skeletons=Ponify skeletons
|
||||
minelp.mobs.illagers=Ponify illagers
|
||||
minelp.mobs.guardians=Ponify guardians
|
||||
minelp.mobs.endermen=Ponify endermen
|
||||
minelp.mobs.title=Duck Settings
|
||||
minelp.mobs.villagers=Duckify villagers
|
||||
minelp.mobs.zombies=Duckify zombies
|
||||
minelp.mobs.pigzombies=Duckify zombie pigmen
|
||||
minelp.mobs.skeletons=Duckify skeletons
|
||||
minelp.mobs.illagers=Duckify illagers
|
||||
minelp.mobs.guardians=Duckify guardians
|
||||
minelp.mobs.endermen=Duckify endermen
|
||||
|
||||
minelp.mode.dry=Land pony
|
||||
minelp.mode.wet=Sea pony
|
||||
minelp.mode.dry=Dry duck
|
||||
minelp.mode.wet=Wet duck
|
||||
|
||||
minelp.debug.reload_models.message=Reloading pony models...
|
||||
minelp.debug.reload_models.message=Reloading duck models...
|
||||
minelp.debug.scale=Scaling Factor
|
||||
minelp.debug.scale.value=Scale: %s
|
||||
minelp.debug.scale.meg=Mega
|
||||
minelp.debug.scale.max=Double
|
||||
minelp.debug.scale.mid=Default
|
||||
minelp.debug.scale.sa=Show Accurate
|
||||
minelp.debug.scale.sa=Quack Accurate
|
||||
minelp.debug.scale.min=Miniscule
|
|
@ -1,26 +1,26 @@
|
|||
# Mine Little Pony fr_FR.lang file
|
||||
# Provided by Dalfio (PinkishPie)
|
||||
minelp.options.title=Options Mine Little Pony
|
||||
minelp.options.ponylevel=Niveau Poney
|
||||
minelp.options.ponylevel.ponies=Seuls Poneys
|
||||
minelp.options.ponylevel.humans=Seuls Humains
|
||||
minelp.options.ponylevel.both=Deux
|
||||
minelp.options.title=Options Mine Biggest Ducky
|
||||
minelp.options.ponylevel=Niveau Canard
|
||||
minelp.options.ponylevel.ponies=Niveau Canard
|
||||
minelp.options.ponylevel.humans=Niveau Canard
|
||||
minelp.options.ponylevel.both=Niveau Canard
|
||||
minelp.options.options=Options Poney
|
||||
minelp.options.hd=Activer MineLP serveur de skin
|
||||
minelp.options.sizes=Autoriser tous les différentes tailles de poney
|
||||
minelp.options.snuzzles=Afficher museau sur les poneys
|
||||
minelp.options.showscale=Utiliser échelle fidéle á MLP
|
||||
minelp.options.hd=Activer MineBD serveur de skin
|
||||
minelp.options.sizes=Autoriser tous les différentes tailles de canard
|
||||
minelp.options.snuzzles=Afficher museau sur les canard
|
||||
minelp.options.showscale=Utiliser échelle fidéle á Disney
|
||||
minelp.options.fpsmagic=Ponies use magic in first-person
|
||||
minelp.options.ponyskulls=Render mob heads as ponies
|
||||
minelp.options.ponyskulls=Render mob heads as ducks
|
||||
|
||||
minelp.mobs.title=Options de mobs
|
||||
minelp.mobs.villagers=Ponifier villageois
|
||||
minelp.mobs.zombies=Ponifier zombies
|
||||
minelp.mobs.pigzombies=Ponifier cochon-zombie
|
||||
minelp.mobs.skeletons=Ponifier squelettes
|
||||
minelp.mobs.illagers=Ponifier illagers
|
||||
minelp.mobs.guardians=Ponifier gardien
|
||||
minelp.mobs.endermen=Ponifier endermen
|
||||
minelp.mobs.title=Options de canarde
|
||||
minelp.mobs.villagers=Canardifier villageois
|
||||
minelp.mobs.zombies=Canardifier zombies
|
||||
minelp.mobs.pigzombies=Canardifier cochon-zombie
|
||||
minelp.mobs.skeletons=Canardifier squelettes
|
||||
minelp.mobs.illagers=Canardifier illagers
|
||||
minelp.mobs.guardians=Canardifier gardien
|
||||
minelp.mobs.endermen=Canardifier endermen
|
||||
|
||||
minelp.mode.dry=Poney terrestre
|
||||
minelp.mode.wet=Poney de mer
|
||||
minelp.mode.dry=Canard terrestre
|
||||
minelp.mode.wet=Canard de mer
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"name": "minelittlepony",
|
||||
"name": "minebiggestducky",
|
||||
"mcversion": "${mcversion}",
|
||||
"version": "${version}",
|
||||
"revision": "${revision}",
|
||||
"description": "Mine Little Pony turns players and mobs into ponies",
|
||||
"description": "Ducktales Copyright Disney Corporation. By using this, you are a terrible person.",
|
||||
"mixinConfigs": [
|
||||
"minelp.mixin.json",
|
||||
"hdskins.mixin.json"
|
||||
|
|
Loading…
Reference in a new issue