-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Kudos to Climbable (MIT) for jumpClimbing: https://github.com/Blue-Beaker/climbable-mc/blob/405db8ad8b8d7b7625e8aea640886f11be3d5584/src/main/java/io/bluebeaker/climbable/mixin/MixinEntityLivingBase.java Kudos to Fabrication (MIT) for rmbClear: https://github.com/FalsehoodMC/Fabrication/blob/ecc8f510fa431f88485037babd8ebf01a875de24/src/main/java/com/unascribed/fabrication/mixin/b_utility/rmb_clears_text_fields/MixinTextFieldWidget.java Signed-off-by: unilock <unilock@fennet.rentals>
- Loading branch information
Showing
12 changed files
with
136 additions
and
102 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
package cc.unilock.legacyfixes; | ||
|
||
import cc.unilock.legacyfixes.proxy.CommonProxy; | ||
import cpw.mods.fml.common.Mod; | ||
import cpw.mods.fml.common.SidedProxy; | ||
import cpw.mods.fml.common.event.FMLPreInitializationEvent; | ||
|
||
@Mod(modid = Tags.MODID, version = Tags.VERSION, name = Tags.MODNAME, acceptedMinecraftVersions = "[1.7.10]") | ||
public class LegacyFixes { | ||
//public static final Logger LOGGER = LogManager.getLogger(Tags.MODID); | ||
|
||
@SidedProxy(clientSide = "cc.unilock.legacyfixes.proxy.ClientProxy", serverSide = "cc.unilock.legacyfixes.proxy.CommonProxy") | ||
public static CommonProxy proxy; | ||
|
||
@Mod.EventHandler | ||
public void preInit(FMLPreInitializationEvent event) { | ||
proxy.preInit(event); | ||
} | ||
} |
21 changes: 21 additions & 0 deletions
21
src/main/java/cc/unilock/legacyfixes/LegacyFixesConfig.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
package cc.unilock.legacyfixes; | ||
|
||
import net.minecraftforge.common.config.Configuration; | ||
|
||
import java.io.File; | ||
|
||
public class LegacyFixesConfig { | ||
public static boolean jumpClimbing = true; | ||
public static boolean rmbClear = true; | ||
|
||
public static void synchronizeConfiguration(File configFile) { | ||
Configuration configuration = new Configuration(configFile); | ||
|
||
jumpClimbing = configuration.getBoolean("jumpClimbing", Configuration.CATEGORY_GENERAL, jumpClimbing, "Allows climbing ladders by jumping"); | ||
rmbClear = configuration.getBoolean("rmbClear", Configuration.CATEGORY_GENERAL, rmbClear, "Allows clearing text fields by right-clicking"); | ||
|
||
if (configuration.hasChanged()) { | ||
configuration.save(); | ||
} | ||
} | ||
} |
This file was deleted.
Oops, something went wrong.
11 changes: 11 additions & 0 deletions
11
src/main/java/cc/unilock/legacyfixes/mixin/EntityLivingBaseAccessor.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
package cc.unilock.legacyfixes.mixin; | ||
|
||
import net.minecraft.entity.EntityLivingBase; | ||
import org.spongepowered.asm.mixin.Mixin; | ||
import org.spongepowered.asm.mixin.gen.Accessor; | ||
|
||
@Mixin(EntityLivingBase.class) | ||
public interface EntityLivingBaseAccessor { | ||
@Accessor | ||
boolean getIsJumping(); | ||
} |
16 changes: 16 additions & 0 deletions
16
src/main/java/cc/unilock/legacyfixes/mixin/EntityLivingBaseMixin.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
package cc.unilock.legacyfixes.mixin; | ||
|
||
import cc.unilock.legacyfixes.LegacyFixesConfig; | ||
import net.minecraft.entity.EntityLivingBase; | ||
import org.objectweb.asm.Opcodes; | ||
import org.spongepowered.asm.mixin.Mixin; | ||
import org.spongepowered.asm.mixin.injection.At; | ||
import org.spongepowered.asm.mixin.injection.Redirect; | ||
|
||
@Mixin(EntityLivingBase.class) | ||
public class EntityLivingBaseMixin { | ||
@Redirect(method = "Lnet/minecraft/entity/EntityLivingBase;moveEntityWithHeading(FF)V", at = @At(value = "FIELD", target = "Lnet/minecraft/entity/EntityLivingBase;isCollidedHorizontally:Z", opcode = Opcodes.GETFIELD, ordinal = 2)) | ||
private boolean isCollidedHorizontally(EntityLivingBase instance) { | ||
return instance.isCollidedHorizontally || ((EntityLivingBaseAccessor) instance).getIsJumping() && LegacyFixesConfig.jumpClimbing; | ||
} | ||
} |
41 changes: 41 additions & 0 deletions
41
src/main/java/cc/unilock/legacyfixes/mixin/client/GuiTextFieldMixin.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
package cc.unilock.legacyfixes.mixin.client; | ||
|
||
import cc.unilock.legacyfixes.LegacyFixesConfig; | ||
import net.minecraft.client.gui.GuiTextField; | ||
import org.spongepowered.asm.mixin.Mixin; | ||
import org.spongepowered.asm.mixin.Shadow; | ||
import org.spongepowered.asm.mixin.injection.At; | ||
import org.spongepowered.asm.mixin.injection.Inject; | ||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; | ||
|
||
@Mixin(GuiTextField.class) | ||
public abstract class GuiTextFieldMixin { | ||
@Shadow | ||
public int xPosition; | ||
@Shadow | ||
public int yPosition; | ||
@Shadow | ||
public int width; | ||
@Shadow | ||
public int height; | ||
@Shadow | ||
private boolean canLoseFocus; | ||
@Shadow | ||
private boolean isFocused; | ||
@Shadow | ||
private boolean isEnabled; | ||
@Shadow | ||
private boolean visible; | ||
|
||
@Shadow | ||
public abstract void setText(String text); | ||
|
||
@Inject(method = "Lnet/minecraft/client/gui/GuiTextField;mouseClicked(III)V", at = @At(value = "HEAD"), cancellable = true) | ||
private void mouseClicked(int mouseX, int mouseY, int button, CallbackInfo ci) { | ||
if (!LegacyFixesConfig.rmbClear) return; | ||
if (button == 1 && this.visible && this.isEnabled && (this.isFocused || this.canLoseFocus) && (mouseX >= this.xPosition && mouseX < this.xPosition + this.width && mouseY >= this.yPosition && mouseY < this.yPosition + this.height)) { | ||
this.setText(""); | ||
ci.cancel(); | ||
} | ||
} | ||
} |
10 changes: 10 additions & 0 deletions
10
src/main/java/cc/unilock/legacyfixes/proxy/ClientProxy.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
package cc.unilock.legacyfixes.proxy; | ||
|
||
import cpw.mods.fml.common.event.FMLPreInitializationEvent; | ||
|
||
public class ClientProxy extends CommonProxy { | ||
@Override | ||
public void preInit(FMLPreInitializationEvent event) { | ||
super.preInit(event); | ||
} | ||
} |
11 changes: 11 additions & 0 deletions
11
src/main/java/cc/unilock/legacyfixes/proxy/CommonProxy.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
package cc.unilock.legacyfixes.proxy; | ||
|
||
import cc.unilock.legacyfixes.LegacyFixesConfig; | ||
import cpw.mods.fml.common.event.FMLPreInitializationEvent; | ||
|
||
public class CommonProxy { | ||
public void preInit(FMLPreInitializationEvent event) { | ||
LegacyFixesConfig.synchronizeConfiguration(event.getSuggestedConfigurationFile()); | ||
//LegacyFixes.LOGGER.info("Initialized!"); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters