From 9b9a20f8a0cd054b8d38334cdcecc5a78679f2fe Mon Sep 17 00:00:00 2001 From: kotmatross28729 Date: Tue, 20 Feb 2024 15:55:01 +0300 Subject: [PATCH] small refactoring --- .github/workflows/build-and-test.yml | 13 -- build.gradle | 2 +- gradle.properties | 8 +- src/main/java/com/kotmatross/fixer/Tags.java | 11 -- .../fixer/asm/OptimizedMixinPlugin.java | 111 ------------------ .../kotmatross/fixer/proxy/CommonProxy.java | 4 - .../ShadersFixer.java} | 14 +-- .../com/kotmatross/shadersfixer/Tags.java | 11 ++ .../asm/OptimizedMixinPlugin.java | 88 ++++++++++++++ .../config/ShaderFixerConfig.java | 26 ++++ .../client}/MixinSHRenderHooks.java | 7 +- .../beam}/MixinBeamRendererLightning.java | 4 +- .../json/beam}/MixinBeamRendererLine.java | 4 +- .../json/shape}/MixinShapeFormatCircles.java | 4 +- .../json/shape}/MixinShapeFormatLines.java | 4 +- .../shape}/MixinShapeFormatWireframe.java | 5 +- .../particle}/MixinEntitySHSpellWaveFX.java | 5 +- .../render/effect}/MixinEffectTentacles.java | 2 +- .../entity}/MixinRenderGrappleRope.java | 4 +- .../entity/effect}/MixinRenderEarthCrack.java | 4 +- .../effect}/MixinRenderGravityWave.java | 4 +- .../projectile}/MixinRenderEnergyBolt.java | 4 +- .../projectile}/MixinRenderGrapplingHook.java | 5 +- .../projectile}/MixinRenderSonicWave.java | 4 +- .../projectile}/MixinRenderSpellWhip.java | 4 +- .../MixinBulletProjectileRenderer.java | 4 +- .../MixinProjectileRenderHandler.java | 4 +- .../tile}/MixinRenderSuitFabricator.java | 4 +- .../proxy/ClientProxy.java | 2 +- .../shadersfixer/proxy/CommonProxy.java | 4 + .../proxy/ServerProxy.java | 2 +- .../{fixer => shadersfixer}/utils.java | 2 +- .../{fixer_at.cfg => shadersfixer_at.cfg} | 0 .../textures/shaders_workaround.png | Bin src/main/resources/mixins.fixer.json | 40 +++---- src/main/resources/mixins.shadersfixer.json | 12 ++ 36 files changed, 213 insertions(+), 213 deletions(-) delete mode 100644 .github/workflows/build-and-test.yml delete mode 100644 src/main/java/com/kotmatross/fixer/Tags.java delete mode 100644 src/main/java/com/kotmatross/fixer/asm/OptimizedMixinPlugin.java delete mode 100644 src/main/java/com/kotmatross/fixer/proxy/CommonProxy.java rename src/main/java/com/kotmatross/{fixer/Fixer.java => shadersfixer/ShadersFixer.java} (82%) create mode 100644 src/main/java/com/kotmatross/shadersfixer/Tags.java create mode 100644 src/main/java/com/kotmatross/shadersfixer/asm/OptimizedMixinPlugin.java create mode 100644 src/main/java/com/kotmatross/shadersfixer/config/ShaderFixerConfig.java rename src/main/java/com/kotmatross/{fixer/mixins/client/FiskHeroes => shadersfixer/mixins/client/FiskHeroes/client}/MixinSHRenderHooks.java (94%) rename src/main/java/com/kotmatross/{fixer/mixins/client/FiskHeroes => shadersfixer/mixins/client/FiskHeroes/client/pack/json/beam}/MixinBeamRendererLightning.java (90%) rename src/main/java/com/kotmatross/{fixer/mixins/client/FiskHeroes => shadersfixer/mixins/client/FiskHeroes/client/pack/json/beam}/MixinBeamRendererLine.java (93%) rename src/main/java/com/kotmatross/{fixer/mixins/client/FiskHeroes => shadersfixer/mixins/client/FiskHeroes/client/pack/json/shape}/MixinShapeFormatCircles.java (89%) rename src/main/java/com/kotmatross/{fixer/mixins/client/FiskHeroes => shadersfixer/mixins/client/FiskHeroes/client/pack/json/shape}/MixinShapeFormatLines.java (89%) rename src/main/java/com/kotmatross/{fixer/mixins/client/FiskHeroes => shadersfixer/mixins/client/FiskHeroes/client/pack/json/shape}/MixinShapeFormatWireframe.java (89%) rename src/main/java/com/kotmatross/{fixer/mixins/client/FiskHeroes => shadersfixer/mixins/client/FiskHeroes/client/particle}/MixinEntitySHSpellWaveFX.java (87%) rename src/main/java/com/kotmatross/{fixer/mixins/client/FiskHeroes => shadersfixer/mixins/client/FiskHeroes/client/render/effect}/MixinEffectTentacles.java (96%) rename src/main/java/com/kotmatross/{fixer/mixins/client/FiskHeroes => shadersfixer/mixins/client/FiskHeroes/client/render/entity}/MixinRenderGrappleRope.java (97%) rename src/main/java/com/kotmatross/{fixer/mixins/client/FiskHeroes => shadersfixer/mixins/client/FiskHeroes/client/render/entity/effect}/MixinRenderEarthCrack.java (93%) rename src/main/java/com/kotmatross/{fixer/mixins/client/FiskHeroes => shadersfixer/mixins/client/FiskHeroes/client/render/entity/effect}/MixinRenderGravityWave.java (89%) rename src/main/java/com/kotmatross/{fixer/mixins/client/FiskHeroes => shadersfixer/mixins/client/FiskHeroes/client/render/entity/projectile}/MixinRenderEnergyBolt.java (96%) rename src/main/java/com/kotmatross/{fixer/mixins/client/FiskHeroes => shadersfixer/mixins/client/FiskHeroes/client/render/entity/projectile}/MixinRenderGrapplingHook.java (88%) rename src/main/java/com/kotmatross/{fixer/mixins/client/FiskHeroes => shadersfixer/mixins/client/FiskHeroes/client/render/entity/projectile}/MixinRenderSonicWave.java (95%) rename src/main/java/com/kotmatross/{fixer/mixins/client/FiskHeroes => shadersfixer/mixins/client/FiskHeroes/client/render/entity/projectile}/MixinRenderSpellWhip.java (90%) rename src/main/java/com/kotmatross/{fixer/mixins/client/FiskHeroes => shadersfixer/mixins/client/FiskHeroes/client/render/projectile}/MixinBulletProjectileRenderer.java (95%) rename src/main/java/com/kotmatross/{fixer/mixins/client/FiskHeroes => shadersfixer/mixins/client/FiskHeroes/client/render/projectile}/MixinProjectileRenderHandler.java (94%) rename src/main/java/com/kotmatross/{fixer/mixins/client/FiskHeroes => shadersfixer/mixins/client/FiskHeroes/client/render/tile}/MixinRenderSuitFabricator.java (95%) rename src/main/java/com/kotmatross/{fixer => shadersfixer}/proxy/ClientProxy.java (53%) create mode 100644 src/main/java/com/kotmatross/shadersfixer/proxy/CommonProxy.java rename src/main/java/com/kotmatross/{fixer => shadersfixer}/proxy/ServerProxy.java (53%) rename src/main/java/com/kotmatross/{fixer => shadersfixer}/utils.java (83%) rename src/main/resources/META-INF/{fixer_at.cfg => shadersfixer_at.cfg} (100%) rename src/main/resources/assets/{fixer => shadersfixer}/textures/shaders_workaround.png (100%) create mode 100644 src/main/resources/mixins.shadersfixer.json diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml deleted file mode 100644 index 3ee2f68..0000000 --- a/.github/workflows/build-and-test.yml +++ /dev/null @@ -1,13 +0,0 @@ - -name: Build and test - -on: - pull_request: - branches: [ master, main ] - push: - branches: [ master, main ] - -jobs: - build-and-test: - uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/build-and-test.yml@master - secrets: inherit diff --git a/build.gradle b/build.gradle index eaad0a6..2fbaac5 100644 --- a/build.gradle +++ b/build.gradle @@ -400,7 +400,7 @@ catch (Exception ignored) { 'or the VERSION override must be set! ').style(Style.SuccessHeader).text('(Do NOT download from GitHub using the ZIP option, instead\n' + 'clone the repository, see ').style(Style.Info).text('https://gtnh.miraheze.org/wiki/Development').style(Style.SuccessHeader).println(' for details.)' ) - versionOverride = '1.0.0' + versionOverride = '1.1' identifiedVersion = versionOverride } version = identifiedVersion diff --git a/gradle.properties b/gradle.properties index 28b8200..65b8ae4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,9 @@ -modName = Fixer +modName = Shaders Fixer # This is a case-sensitive string to identify your mod. Convention is to use lower case. -modId = fixer +modId = shadersfixer -modGroup = com.kotmatross.fixer +modGroup = com.kotmatross.shadersfixer # WHY is there no version field? # The build script relies on git to provide a version via tags. It is super easy and will enable you to always know the @@ -44,7 +44,7 @@ apiPackage = # Specify the configuration file for Forge's access transformers here. It must be placed into /src/main/resources/META-INF/ # There can be multiple files in a space-separated list. # Example value: mymodid_at.cfg nei_at.cfg -accessTransformersFile = fixer_at.cfg +accessTransformersFile = shadersfixer_at.cfg # Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled! usesMixins = true diff --git a/src/main/java/com/kotmatross/fixer/Tags.java b/src/main/java/com/kotmatross/fixer/Tags.java deleted file mode 100644 index 2773e15..0000000 --- a/src/main/java/com/kotmatross/fixer/Tags.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.kotmatross.fixer; - -public class Tags { - - public static final String MODID = "fixer"; - public static final String MODNAME = "Fixer"; - public static final String VERSION = "1.0"; - public static final String MCVERSION = "1.7.10"; - public static final String CLIENTPROXY = "com.kotmatross.fixer.proxy.ClientProxy"; - public static final String SERVERPROXY = "com.kotmatross.fixer.proxy.CommonProxy"; -} diff --git a/src/main/java/com/kotmatross/fixer/asm/OptimizedMixinPlugin.java b/src/main/java/com/kotmatross/fixer/asm/OptimizedMixinPlugin.java deleted file mode 100644 index 44a1584..0000000 --- a/src/main/java/com/kotmatross/fixer/asm/OptimizedMixinPlugin.java +++ /dev/null @@ -1,111 +0,0 @@ -package com.kotmatross.fixer.asm; - -import com.kotmatross.fixer.Fixer; -import org.spongepowered.asm.lib.tree.ClassNode; -import org.spongepowered.asm.mixin.MixinEnvironment; -import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; -import org.spongepowered.asm.mixin.extensibility.IMixinInfo; - -import java.util.ArrayList; -import java.util.List; -import java.util.Set; - -public class OptimizedMixinPlugin implements IMixinConfigPlugin { - - public static final MixinEnvironment.Side side = MixinEnvironment.getCurrentEnvironment().getSide(); - @Override - public void onLoad(String mixinPackage) { - } - - @Override - public String getRefMapperConfig() { - return null; - } - - @Override - public boolean shouldApplyMixin(String targetClassName, String mixinClassName) { - return true; - } - - @Override - public void acceptTargets(Set myTargets, Set otherTargets) { - } - - @Override - public List getMixins() { - List mixins = new ArrayList<>(); - Fixer.logger.info("Trying to load fixer mixins ..."); - - if (side == MixinEnvironment.Side.CLIENT) { - try { - mixins.add("client.FiskHeroes.MixinBulletProjectileRenderer"); - Fixer.logger.info("client.FiskHeroes.MixinBulletProjectileRenderer loaded "); - - mixins.add("client.FiskHeroes.MixinProjectileRenderHandler"); - Fixer.logger.info("client.FiskHeroes.MixinProjectileRenderHandler loaded "); - - mixins.add("client.FiskHeroes.MixinRenderEnergyBolt"); - Fixer.logger.info("client.FiskHeroes.MixinRenderEnergyBolt loaded "); - - mixins.add("client.FiskHeroes.MixinRenderGrappleRope"); - Fixer.logger.info("client.FiskHeroes.MixinRenderGrappleRope loaded "); - - mixins.add("client.FiskHeroes.MixinRenderGrapplingHook"); - Fixer.logger.info("client.FiskHeroes.MixinRenderGrapplingHook loaded "); - - mixins.add("client.FiskHeroes.MixinRenderSonicWave"); - Fixer.logger.info("client.FiskHeroes.MixinRenderSonicWave loaded "); - - mixins.add("client.FiskHeroes.MixinSHRenderHooks"); - Fixer.logger.info("client.FiskHeroes.MixinSHRenderHooks loaded "); - - mixins.add("client.FiskHeroes.MixinRenderSpellWhip"); - Fixer.logger.info("client.FiskHeroes.MixinRenderSpellWhip loaded "); - - mixins.add("client.FiskHeroes.MixinRenderEarthCrack"); - Fixer.logger.info("client.FiskHeroes.MixinRenderEarthCrack loaded "); - - mixins.add("client.FiskHeroes.MixinRenderGravityWave"); - Fixer.logger.info("client.FiskHeroes.MixinRenderGravityWave loaded "); - - mixins.add("client.FiskHeroes.MixinEffectTentacles"); - Fixer.logger.info("client.FiskHeroes.MixinEffectTentacles loaded "); - - mixins.add("client.FiskHeroes.MixinEntitySHSpellWaveFX"); - Fixer.logger.info("client.FiskHeroes.MixinEntitySHSpellWaveFX loaded "); - - mixins.add("client.FiskHeroes.MixinShapeFormatCircles"); - Fixer.logger.info("client.FiskHeroes.MixinShapeFormatCircles loaded "); - - mixins.add("client.FiskHeroes.MixinShapeFormatLines"); - Fixer.logger.info("client.FiskHeroes.MixinShapeFormatLines loaded "); - - mixins.add("client.FiskHeroes.MixinShapeFormatWireframe"); - Fixer.logger.info("client.FiskHeroes.MixinShapeFormatWireframe loaded "); - - mixins.add("client.FiskHeroes.MixinBeamRendererLine"); - Fixer.logger.info("client.FiskHeroes.MixinBeamRendererLine loaded "); - - mixins.add("client.FiskHeroes.MixinBeamRendererLightning"); - Fixer.logger.info("client.FiskHeroes.MixinBeamRendererLightning loaded "); - - mixins.add("client.FiskHeroes.MixinRenderSuitFabricator"); - Fixer.logger.info("client.FiskHeroes.MixinRenderSuitFabricator loaded "); - } catch (Exception e) { - Fixer.logger.error("Error loading mixins: " + e.getMessage()); - e.printStackTrace(); - } - } - - return mixins; - } - - @Override - public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { - } - - @Override - public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { - } - -} diff --git a/src/main/java/com/kotmatross/fixer/proxy/CommonProxy.java b/src/main/java/com/kotmatross/fixer/proxy/CommonProxy.java deleted file mode 100644 index 757221c..0000000 --- a/src/main/java/com/kotmatross/fixer/proxy/CommonProxy.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.kotmatross.fixer.proxy; - -public class CommonProxy { -} diff --git a/src/main/java/com/kotmatross/fixer/Fixer.java b/src/main/java/com/kotmatross/shadersfixer/ShadersFixer.java similarity index 82% rename from src/main/java/com/kotmatross/fixer/Fixer.java rename to src/main/java/com/kotmatross/shadersfixer/ShadersFixer.java index ca5aac5..0dc4134 100644 --- a/src/main/java/com/kotmatross/fixer/Fixer.java +++ b/src/main/java/com/kotmatross/shadersfixer/ShadersFixer.java @@ -1,12 +1,12 @@ -package com.kotmatross.fixer; +package com.kotmatross.shadersfixer; -import net.minecraftforge.common.config.Configuration; - -import cpw.mods.fml.common.*; +import com.kotmatross.shadersfixer.proxy.CommonProxy; +import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import com.kotmatross.fixer.proxy.CommonProxy; +import net.minecraftforge.common.config.Configuration; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -17,10 +17,10 @@ dependencies = "required-after:gtnhmixins@[2.0.0,);" + "required-after:fiskheroes@[2.3.1,);") -public class Fixer { +public class ShadersFixer { @Mod.Instance(Tags.MODID) - public static Fixer instance; + public static ShadersFixer instance; @SidedProxy(clientSide = Tags.CLIENTPROXY, serverSide = Tags.SERVERPROXY) public static CommonProxy proxy; public static Configuration config; diff --git a/src/main/java/com/kotmatross/shadersfixer/Tags.java b/src/main/java/com/kotmatross/shadersfixer/Tags.java new file mode 100644 index 0000000..c41be75 --- /dev/null +++ b/src/main/java/com/kotmatross/shadersfixer/Tags.java @@ -0,0 +1,11 @@ +package com.kotmatross.shadersfixer; + +public class Tags { + + public static final String MODID = "shadersfixer"; + public static final String MODNAME = "Shaders Fixer"; + public static final String VERSION = "1.1"; + public static final String MCVERSION = "1.7.10"; + public static final String CLIENTPROXY = "com.kotmatross.shadersfixer.proxy.ClientProxy"; + public static final String SERVERPROXY = "com.kotmatross.shadersfixer.proxy.CommonProxy"; +} diff --git a/src/main/java/com/kotmatross/shadersfixer/asm/OptimizedMixinPlugin.java b/src/main/java/com/kotmatross/shadersfixer/asm/OptimizedMixinPlugin.java new file mode 100644 index 0000000..7103c79 --- /dev/null +++ b/src/main/java/com/kotmatross/shadersfixer/asm/OptimizedMixinPlugin.java @@ -0,0 +1,88 @@ +package com.kotmatross.shadersfixer.asm; + +import com.kotmatross.shadersfixer.ShadersFixer; +import com.kotmatross.shadersfixer.Tags; +import com.kotmatross.shadersfixer.config.ShaderFixerConfig; +import net.minecraft.launchwrapper.Launch; +import org.spongepowered.asm.lib.tree.ClassNode; +import org.spongepowered.asm.mixin.MixinEnvironment; +import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; +import org.spongepowered.asm.mixin.extensibility.IMixinInfo; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + +public class OptimizedMixinPlugin implements IMixinConfigPlugin { + + public static final MixinEnvironment.Side side = MixinEnvironment.getCurrentEnvironment().getSide(); + @Override + public void onLoad(String mixinPackage) { + } + + @Override + public String getRefMapperConfig() { + return null; + } + + @Override + public boolean shouldApplyMixin(String targetClassName, String mixinClassName) { + return true; + } + + @Override + public void acceptTargets(Set myTargets, Set otherTargets) { + } + + @Override + public List getMixins() { + List mixins = new ArrayList<>(); + + String configFolder = "config" + File.separator + Tags.MODID + File.separator; + ShaderFixerConfig.loadMixinConfig(new File(Launch.minecraftHome, configFolder + "mixins.cfg")); + + if (side == MixinEnvironment.Side.CLIENT) { + ShadersFixer.logger.info("Integrating Shader-fixer client mixins..."); + try { + if(ShaderFixerConfig.FixFisksuperheroesShaders) { + //FISK HEROES MIXINS START + ShadersFixer.logger.info("Trying to integrate fiskheroes mixins"); + mixins.add("client.FiskHeroes.client.pack.json.beam.MixinBeamRendererLightning"); + mixins.add("client.FiskHeroes.client.pack.json.beam.MixinBeamRendererLine"); + mixins.add("client.FiskHeroes.client.pack.json.shape.MixinShapeFormatCircles"); + mixins.add("client.FiskHeroes.client.pack.json.shape.MixinShapeFormatLines"); + mixins.add("client.FiskHeroes.client.pack.json.shape.MixinShapeFormatWireframe"); + mixins.add("client.FiskHeroes.client.particle.MixinEntitySHSpellWaveFX"); + mixins.add("client.FiskHeroes.client.render.effect.MixinEffectTentacles"); + mixins.add("client.FiskHeroes.client.render.entity.effect.MixinRenderEarthCrack"); + mixins.add("client.FiskHeroes.client.render.entity.effect.MixinRenderGravityWave"); + mixins.add("client.FiskHeroes.client.render.entity.projectile.MixinRenderEnergyBolt"); + mixins.add("client.FiskHeroes.client.render.entity.projectile.MixinRenderGrapplingHook"); + mixins.add("client.FiskHeroes.client.render.entity.projectile.MixinRenderSonicWave"); + mixins.add("client.FiskHeroes.client.render.entity.projectile.MixinRenderSpellWhip"); + mixins.add("client.FiskHeroes.client.render.entity.MixinRenderGrappleRope"); + mixins.add("client.FiskHeroes.client.render.projectile.MixinBulletProjectileRenderer"); + mixins.add("client.FiskHeroes.client.render.projectile.MixinProjectileRenderHandler"); + mixins.add("client.FiskHeroes.client.render.tile.MixinRenderSuitFabricator"); + mixins.add("client.FiskHeroes.client.MixinSHRenderHooks"); + //FISK HEROES MIXINS END + } + } catch (Exception e) { + ShadersFixer.logger.error("Error loading mixins: " + e.getMessage()); + e.printStackTrace(); + } + } + + return mixins; + } + + @Override + public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { + } + + @Override + public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { + } + +} diff --git a/src/main/java/com/kotmatross/shadersfixer/config/ShaderFixerConfig.java b/src/main/java/com/kotmatross/shadersfixer/config/ShaderFixerConfig.java new file mode 100644 index 0000000..afa1aa0 --- /dev/null +++ b/src/main/java/com/kotmatross/shadersfixer/config/ShaderFixerConfig.java @@ -0,0 +1,26 @@ +package com.kotmatross.shadersfixer.config; + +import java.io.File; + +import net.minecraftforge.common.config.Configuration; + +public class ShaderFixerConfig { + // Definitely does NOT look like a BugTorch config + + //Base things + public static boolean FixFisksuperheroesShaders; + + //Category + static final String categoryShadersfixes = "Shaders fixes"; + + public static void loadMixinConfig(File configFile) { + Configuration config = new Configuration(configFile); + + FixFisksuperheroesShaders = config.getBoolean("FixFisksuperheroesShaders", categoryShadersfixes, true, "Fixes rendering errors in Fisk's Superheroes mod when using shaders."); + + if(config.hasChanged()) { + config.save(); + } + } + +} diff --git a/src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinSHRenderHooks.java b/src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/MixinSHRenderHooks.java similarity index 94% rename from src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinSHRenderHooks.java rename to src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/MixinSHRenderHooks.java index 41bcd51..054ca91 100644 --- a/src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinSHRenderHooks.java +++ b/src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/MixinSHRenderHooks.java @@ -1,4 +1,4 @@ -package com.kotmatross.fixer.mixins.client.FiskHeroes; +package com.kotmatross.shadersfixer.mixins.client.FiskHeroes.client; import com.fiskmods.heroes.client.SHRenderHooks; import com.fiskmods.heroes.common.config.SHConfig; @@ -14,8 +14,7 @@ import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Shadow; -import static com.fiskmods.heroes.client.SHRenderHooks.drawUntexturedRect; -import static com.kotmatross.fixer.utils.shaders_fix; +import static com.kotmatross.shadersfixer.utils.shaders_fix; @Mixin(value = SHRenderHooks.class, priority = 999) public class MixinSHRenderHooks { @@ -174,7 +173,7 @@ public static void drawLoadingSquares(float x, float y, float width, float heigh f *= 4.0F; for(int i = 0; i < 2; f = (f + 2.0F) % 4.0F) { - drawUntexturedRect(x1 - (w + s) / 2.0F + s * FiskMath.curve(Math.min(f, 1.0F) - MathHelper.clamp_float(f - 2.0F, 0.0F, 1.0F)), y1 - (w + s) / 2.0F + s * FiskMath.curve(MathHelper.clamp_float(f - 1.0F, 0.0F, 1.0F) - MathHelper.clamp_float(f - 3.0F, 0.0F, 1.0F)), w, w, zLevel, -1); + SHRenderHooks.drawUntexturedRect(x1 - (w + s) / 2.0F + s * FiskMath.curve(Math.min(f, 1.0F) - MathHelper.clamp_float(f - 2.0F, 0.0F, 1.0F)), y1 - (w + s) / 2.0F + s * FiskMath.curve(MathHelper.clamp_float(f - 1.0F, 0.0F, 1.0F) - MathHelper.clamp_float(f - 3.0F, 0.0F, 1.0F)), w, w, zLevel, -1); ++i; } diff --git a/src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinBeamRendererLightning.java b/src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/pack/json/beam/MixinBeamRendererLightning.java similarity index 90% rename from src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinBeamRendererLightning.java rename to src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/pack/json/beam/MixinBeamRendererLightning.java index dfae6ea..6be517d 100644 --- a/src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinBeamRendererLightning.java +++ b/src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/pack/json/beam/MixinBeamRendererLightning.java @@ -1,4 +1,4 @@ -package com.kotmatross.fixer.mixins.client.FiskHeroes; +package com.kotmatross.shadersfixer.mixins.client.FiskHeroes.client.pack.json.beam; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; @@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.injection.Slice; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import static com.kotmatross.fixer.utils.shaders_fix; +import static com.kotmatross.shadersfixer.utils.shaders_fix; @Mixin(value = com.fiskmods.heroes.client.pack.json.beam.BeamRendererLightning.class, priority = 999) public abstract class MixinBeamRendererLightning implements com.fiskmods.heroes.client.pack.json.beam.IBeamRenderer { diff --git a/src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinBeamRendererLine.java b/src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/pack/json/beam/MixinBeamRendererLine.java similarity index 93% rename from src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinBeamRendererLine.java rename to src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/pack/json/beam/MixinBeamRendererLine.java index 9e5d274..2e5cd31 100644 --- a/src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinBeamRendererLine.java +++ b/src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/pack/json/beam/MixinBeamRendererLine.java @@ -1,4 +1,4 @@ -package com.kotmatross.fixer.mixins.client.FiskHeroes; +package com.kotmatross.shadersfixer.mixins.client.FiskHeroes.client.pack.json.beam; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; @@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.injection.Slice; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import static com.kotmatross.fixer.utils.shaders_fix; +import static com.kotmatross.shadersfixer.utils.shaders_fix; @Mixin(value = com.fiskmods.heroes.client.pack.json.beam.BeamRendererLine.class, priority = 999) public abstract class MixinBeamRendererLine implements com.fiskmods.heroes.client.pack.json.beam.IBeamRenderer { diff --git a/src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinShapeFormatCircles.java b/src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/pack/json/shape/MixinShapeFormatCircles.java similarity index 89% rename from src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinShapeFormatCircles.java rename to src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/pack/json/shape/MixinShapeFormatCircles.java index 31383e5..1c024d5 100644 --- a/src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinShapeFormatCircles.java +++ b/src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/pack/json/shape/MixinShapeFormatCircles.java @@ -1,4 +1,4 @@ -package com.kotmatross.fixer.mixins.client.FiskHeroes; +package com.kotmatross.shadersfixer.mixins.client.FiskHeroes.client.pack.json.shape; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; @@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.injection.Slice; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import static com.kotmatross.fixer.utils.shaders_fix; +import static com.kotmatross.shadersfixer.utils.shaders_fix; @Mixin(value = com.fiskmods.heroes.client.pack.json.shape.ShapeFormatCircles.class, priority = 999) public abstract class MixinShapeFormatCircles implements com.fiskmods.heroes.client.pack.json.shape.IShapeFormat { diff --git a/src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinShapeFormatLines.java b/src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/pack/json/shape/MixinShapeFormatLines.java similarity index 89% rename from src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinShapeFormatLines.java rename to src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/pack/json/shape/MixinShapeFormatLines.java index 58f55ae..e6f9911 100644 --- a/src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinShapeFormatLines.java +++ b/src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/pack/json/shape/MixinShapeFormatLines.java @@ -1,4 +1,4 @@ -package com.kotmatross.fixer.mixins.client.FiskHeroes; +package com.kotmatross.shadersfixer.mixins.client.FiskHeroes.client.pack.json.shape; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; @@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.injection.Slice; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import static com.kotmatross.fixer.utils.shaders_fix; +import static com.kotmatross.shadersfixer.utils.shaders_fix; @Mixin(value = com.fiskmods.heroes.client.pack.json.shape.ShapeFormatLines.class, priority = 999) public abstract class MixinShapeFormatLines implements com.fiskmods.heroes.client.pack.json.shape.IShapeFormat { diff --git a/src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinShapeFormatWireframe.java b/src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/pack/json/shape/MixinShapeFormatWireframe.java similarity index 89% rename from src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinShapeFormatWireframe.java rename to src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/pack/json/shape/MixinShapeFormatWireframe.java index 60ddbef..69edc16 100644 --- a/src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinShapeFormatWireframe.java +++ b/src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/pack/json/shape/MixinShapeFormatWireframe.java @@ -1,4 +1,5 @@ -package com.kotmatross.fixer.mixins.client.FiskHeroes; +package com.kotmatross.shadersfixer.mixins.client.FiskHeroes.client.pack.json.shape; + import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import org.spongepowered.asm.mixin.Mixin; @@ -7,7 +8,7 @@ import org.spongepowered.asm.mixin.injection.Slice; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import static com.kotmatross.fixer.utils.shaders_fix; +import static com.kotmatross.shadersfixer.utils.shaders_fix; @Mixin(value = com.fiskmods.heroes.client.pack.json.shape.ShapeFormatWireframe.class, priority = 999) public abstract class MixinShapeFormatWireframe implements com.fiskmods.heroes.client.pack.json.shape.IShapeFormat { diff --git a/src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinEntitySHSpellWaveFX.java b/src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/particle/MixinEntitySHSpellWaveFX.java similarity index 87% rename from src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinEntitySHSpellWaveFX.java rename to src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/particle/MixinEntitySHSpellWaveFX.java index edcff0d..9fa90d2 100644 --- a/src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinEntitySHSpellWaveFX.java +++ b/src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/particle/MixinEntitySHSpellWaveFX.java @@ -1,8 +1,7 @@ -package com.kotmatross.fixer.mixins.client.FiskHeroes; +package com.kotmatross.shadersfixer.mixins.client.FiskHeroes.client.particle; import com.fiskmods.heroes.client.particle.EntitySHSpellWaveFX; -import com.fiskmods.heroes.common.entity.effect.EntityEarthCrack; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Tessellator; import org.spongepowered.asm.mixin.Mixin; @@ -11,7 +10,7 @@ import org.spongepowered.asm.mixin.injection.Slice; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import static com.kotmatross.fixer.utils.shaders_fix; +import static com.kotmatross.shadersfixer.utils.shaders_fix; @Mixin(value = EntitySHSpellWaveFX.class, priority = 999) public class MixinEntitySHSpellWaveFX { diff --git a/src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinEffectTentacles.java b/src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/render/effect/MixinEffectTentacles.java similarity index 96% rename from src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinEffectTentacles.java rename to src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/render/effect/MixinEffectTentacles.java index a2c9126..6e6aa7a 100644 --- a/src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinEffectTentacles.java +++ b/src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/render/effect/MixinEffectTentacles.java @@ -1,4 +1,4 @@ -package com.kotmatross.fixer.mixins.client.FiskHeroes; +package com.kotmatross.shadersfixer.mixins.client.FiskHeroes.client.render.effect; import com.fiskmods.heroes.client.render.effect.Effect; diff --git a/src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinRenderGrappleRope.java b/src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/render/entity/MixinRenderGrappleRope.java similarity index 97% rename from src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinRenderGrappleRope.java rename to src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/render/entity/MixinRenderGrappleRope.java index 7ca3a06..cae99bd 100644 --- a/src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinRenderGrappleRope.java +++ b/src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/render/entity/MixinRenderGrappleRope.java @@ -1,4 +1,4 @@ -package com.kotmatross.fixer.mixins.client.FiskHeroes; +package com.kotmatross.shadersfixer.mixins.client.FiskHeroes.client.render.entity; import com.fiskmods.heroes.client.render.entity.RenderGrappleRope; import com.fiskmods.heroes.common.entity.EntityGrappleRope; @@ -15,7 +15,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; -import static com.kotmatross.fixer.utils.shaders_fix; +import static com.kotmatross.shadersfixer.utils.shaders_fix; @Mixin(value = RenderGrappleRope.class, priority = 999) public abstract class MixinRenderGrappleRope extends Render { diff --git a/src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinRenderEarthCrack.java b/src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/render/entity/effect/MixinRenderEarthCrack.java similarity index 93% rename from src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinRenderEarthCrack.java rename to src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/render/entity/effect/MixinRenderEarthCrack.java index 04dfb7f..043a802 100644 --- a/src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinRenderEarthCrack.java +++ b/src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/render/entity/effect/MixinRenderEarthCrack.java @@ -1,4 +1,4 @@ -package com.kotmatross.fixer.mixins.client.FiskHeroes; +package com.kotmatross.shadersfixer.mixins.client.FiskHeroes.client.render.entity.effect; import com.fiskmods.heroes.client.render.entity.effect.RenderEarthCrack; @@ -14,7 +14,7 @@ import java.util.Random; -import static com.kotmatross.fixer.utils.shaders_fix; +import static com.kotmatross.shadersfixer.utils.shaders_fix; @Mixin(value = RenderEarthCrack.class, priority = 999) public abstract class MixinRenderEarthCrack extends Render { diff --git a/src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinRenderGravityWave.java b/src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/render/entity/effect/MixinRenderGravityWave.java similarity index 89% rename from src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinRenderGravityWave.java rename to src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/render/entity/effect/MixinRenderGravityWave.java index 9b8d406..d85a034 100644 --- a/src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinRenderGravityWave.java +++ b/src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/render/entity/effect/MixinRenderGravityWave.java @@ -1,4 +1,4 @@ -package com.kotmatross.fixer.mixins.client.FiskHeroes; +package com.kotmatross.shadersfixer.mixins.client.FiskHeroes.client.render.entity.effect; import com.fiskmods.heroes.client.render.entity.effect.RenderGravityWave; import com.fiskmods.heroes.common.entity.effect.EntityGravityWave; @@ -10,7 +10,7 @@ import org.spongepowered.asm.mixin.injection.Slice; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import static com.kotmatross.fixer.utils.shaders_fix; +import static com.kotmatross.shadersfixer.utils.shaders_fix; @Mixin(value = RenderGravityWave.class, priority = 999) public abstract class MixinRenderGravityWave extends Render { diff --git a/src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinRenderEnergyBolt.java b/src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/render/entity/projectile/MixinRenderEnergyBolt.java similarity index 96% rename from src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinRenderEnergyBolt.java rename to src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/render/entity/projectile/MixinRenderEnergyBolt.java index 7ab9094..f883982 100644 --- a/src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinRenderEnergyBolt.java +++ b/src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/render/entity/projectile/MixinRenderEnergyBolt.java @@ -1,4 +1,4 @@ -package com.kotmatross.fixer.mixins.client.FiskHeroes; +package com.kotmatross.shadersfixer.mixins.client.FiskHeroes.client.render.entity.projectile; import com.fiskmods.heroes.client.render.entity.projectile.RenderEnergyBolt; @@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; -import static com.kotmatross.fixer.utils.shaders_fix; +import static com.kotmatross.shadersfixer.utils.shaders_fix; @Mixin(value = RenderEnergyBolt.class, priority = 999) public class MixinRenderEnergyBolt { diff --git a/src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinRenderGrapplingHook.java b/src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/render/entity/projectile/MixinRenderGrapplingHook.java similarity index 88% rename from src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinRenderGrapplingHook.java rename to src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/render/entity/projectile/MixinRenderGrapplingHook.java index e859ce8..f55d70e 100644 --- a/src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinRenderGrapplingHook.java +++ b/src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/render/entity/projectile/MixinRenderGrapplingHook.java @@ -1,8 +1,7 @@ -package com.kotmatross.fixer.mixins.client.FiskHeroes; +package com.kotmatross.shadersfixer.mixins.client.FiskHeroes.client.render.entity.projectile; import com.fiskmods.heroes.client.render.entity.projectile.RenderGrapplingHook; import com.fiskmods.heroes.common.entity.projectile.AbstractEntityGrapplingHook; -import com.fiskmods.heroes.common.entity.projectile.EntitySpellWhip; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.Render; import org.spongepowered.asm.mixin.Mixin; @@ -11,7 +10,7 @@ import org.spongepowered.asm.mixin.injection.Slice; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import static com.kotmatross.fixer.utils.shaders_fix; +import static com.kotmatross.shadersfixer.utils.shaders_fix; @Mixin(value = RenderGrapplingHook.class, priority = 999) public abstract class MixinRenderGrapplingHook extends Render { diff --git a/src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinRenderSonicWave.java b/src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/render/entity/projectile/MixinRenderSonicWave.java similarity index 95% rename from src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinRenderSonicWave.java rename to src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/render/entity/projectile/MixinRenderSonicWave.java index 722e906..9f0be20 100644 --- a/src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinRenderSonicWave.java +++ b/src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/render/entity/projectile/MixinRenderSonicWave.java @@ -1,4 +1,4 @@ -package com.kotmatross.fixer.mixins.client.FiskHeroes; +package com.kotmatross.shadersfixer.mixins.client.FiskHeroes.client.render.entity.projectile; import com.fiskmods.heroes.client.render.entity.projectile.RenderSonicWave; import com.fiskmods.heroes.common.entity.projectile.EntitySonicWave; @@ -12,7 +12,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; -import static com.kotmatross.fixer.utils.shaders_fix; +import static com.kotmatross.shadersfixer.utils.shaders_fix; @Mixin(value = RenderSonicWave.class, priority = 999) public abstract class MixinRenderSonicWave extends Render { diff --git a/src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinRenderSpellWhip.java b/src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/render/entity/projectile/MixinRenderSpellWhip.java similarity index 90% rename from src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinRenderSpellWhip.java rename to src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/render/entity/projectile/MixinRenderSpellWhip.java index 9853290..eba1ca3 100644 --- a/src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinRenderSpellWhip.java +++ b/src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/render/entity/projectile/MixinRenderSpellWhip.java @@ -1,4 +1,4 @@ -package com.kotmatross.fixer.mixins.client.FiskHeroes; +package com.kotmatross.shadersfixer.mixins.client.FiskHeroes.client.render.entity.projectile; import com.fiskmods.heroes.client.render.entity.projectile.RenderSpellWhip; import com.fiskmods.heroes.common.entity.projectile.EntitySpellWhip; @@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.injection.Slice; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import static com.kotmatross.fixer.utils.shaders_fix; +import static com.kotmatross.shadersfixer.utils.shaders_fix; @Mixin(value = RenderSpellWhip.class, priority = 999) public abstract class MixinRenderSpellWhip extends Render { diff --git a/src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinBulletProjectileRenderer.java b/src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/render/projectile/MixinBulletProjectileRenderer.java similarity index 95% rename from src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinBulletProjectileRenderer.java rename to src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/render/projectile/MixinBulletProjectileRenderer.java index 7214c18..cfe0d35 100644 --- a/src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinBulletProjectileRenderer.java +++ b/src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/render/projectile/MixinBulletProjectileRenderer.java @@ -1,4 +1,4 @@ -package com.kotmatross.fixer.mixins.client.FiskHeroes; +package com.kotmatross.shadersfixer.mixins.client.FiskHeroes.client.render.projectile; import com.fiskmods.heroes.client.render.projectile.BulletProjectileRenderer; import com.fiskmods.heroes.client.render.projectile.ProjectileRenderer; @@ -13,7 +13,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; -import static com.kotmatross.fixer.utils.shaders_fix; +import static com.kotmatross.shadersfixer.utils.shaders_fix; @Mixin(value = BulletProjectileRenderer.class, priority = 999) public abstract class MixinBulletProjectileRenderer implements ProjectileRenderer { diff --git a/src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinProjectileRenderHandler.java b/src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/render/projectile/MixinProjectileRenderHandler.java similarity index 94% rename from src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinProjectileRenderHandler.java rename to src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/render/projectile/MixinProjectileRenderHandler.java index 76cffe5..ac5b666 100644 --- a/src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinProjectileRenderHandler.java +++ b/src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/render/projectile/MixinProjectileRenderHandler.java @@ -1,4 +1,4 @@ -package com.kotmatross.fixer.mixins.client.FiskHeroes; +package com.kotmatross.shadersfixer.mixins.client.FiskHeroes.client.render.projectile; import com.fiskmods.heroes.client.render.projectile.ProjectileRenderHandler; import com.fiskmods.heroes.common.projectile.ProjectileTrail; @@ -14,7 +14,7 @@ import javax.vecmath.Point3f; -import static com.kotmatross.fixer.utils.shaders_fix; +import static com.kotmatross.shadersfixer.utils.shaders_fix; @Mixin(value = ProjectileRenderHandler.class, priority = 999) public abstract class MixinProjectileRenderHandler { diff --git a/src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinRenderSuitFabricator.java b/src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/render/tile/MixinRenderSuitFabricator.java similarity index 95% rename from src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinRenderSuitFabricator.java rename to src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/render/tile/MixinRenderSuitFabricator.java index 39d35ea..01b5c25 100644 --- a/src/main/java/com/kotmatross/fixer/mixins/client/FiskHeroes/MixinRenderSuitFabricator.java +++ b/src/main/java/com/kotmatross/shadersfixer/mixins/client/FiskHeroes/client/render/tile/MixinRenderSuitFabricator.java @@ -1,4 +1,4 @@ -package com.kotmatross.fixer.mixins.client.FiskHeroes; +package com.kotmatross.shadersfixer.mixins.client.FiskHeroes.client.render.tile; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Tessellator; @@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.injection.Slice; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import static com.kotmatross.fixer.utils.shaders_fix; +import static com.kotmatross.shadersfixer.utils.shaders_fix; @Mixin(value = com.fiskmods.heroes.client.render.tile.RenderSuitFabricator.class, priority = 999) public abstract class MixinRenderSuitFabricator extends TileEntitySpecialRenderer { diff --git a/src/main/java/com/kotmatross/fixer/proxy/ClientProxy.java b/src/main/java/com/kotmatross/shadersfixer/proxy/ClientProxy.java similarity index 53% rename from src/main/java/com/kotmatross/fixer/proxy/ClientProxy.java rename to src/main/java/com/kotmatross/shadersfixer/proxy/ClientProxy.java index bd2d73e..c730d1f 100644 --- a/src/main/java/com/kotmatross/fixer/proxy/ClientProxy.java +++ b/src/main/java/com/kotmatross/shadersfixer/proxy/ClientProxy.java @@ -1,4 +1,4 @@ -package com.kotmatross.fixer.proxy; +package com.kotmatross.shadersfixer.proxy; public class ClientProxy extends CommonProxy { } diff --git a/src/main/java/com/kotmatross/shadersfixer/proxy/CommonProxy.java b/src/main/java/com/kotmatross/shadersfixer/proxy/CommonProxy.java new file mode 100644 index 0000000..1252a9c --- /dev/null +++ b/src/main/java/com/kotmatross/shadersfixer/proxy/CommonProxy.java @@ -0,0 +1,4 @@ +package com.kotmatross.shadersfixer.proxy; + +public class CommonProxy { +} diff --git a/src/main/java/com/kotmatross/fixer/proxy/ServerProxy.java b/src/main/java/com/kotmatross/shadersfixer/proxy/ServerProxy.java similarity index 53% rename from src/main/java/com/kotmatross/fixer/proxy/ServerProxy.java rename to src/main/java/com/kotmatross/shadersfixer/proxy/ServerProxy.java index 96c17a6..b7cc305 100644 --- a/src/main/java/com/kotmatross/fixer/proxy/ServerProxy.java +++ b/src/main/java/com/kotmatross/shadersfixer/proxy/ServerProxy.java @@ -1,4 +1,4 @@ -package com.kotmatross.fixer.proxy; +package com.kotmatross.shadersfixer.proxy; public class ServerProxy extends CommonProxy { } diff --git a/src/main/java/com/kotmatross/fixer/utils.java b/src/main/java/com/kotmatross/shadersfixer/utils.java similarity index 83% rename from src/main/java/com/kotmatross/fixer/utils.java rename to src/main/java/com/kotmatross/shadersfixer/utils.java index ea8c7ef..c041136 100644 --- a/src/main/java/com/kotmatross/fixer/utils.java +++ b/src/main/java/com/kotmatross/shadersfixer/utils.java @@ -1,4 +1,4 @@ -package com.kotmatross.fixer; +package com.kotmatross.shadersfixer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/resources/META-INF/fixer_at.cfg b/src/main/resources/META-INF/shadersfixer_at.cfg similarity index 100% rename from src/main/resources/META-INF/fixer_at.cfg rename to src/main/resources/META-INF/shadersfixer_at.cfg diff --git a/src/main/resources/assets/fixer/textures/shaders_workaround.png b/src/main/resources/assets/shadersfixer/textures/shaders_workaround.png similarity index 100% rename from src/main/resources/assets/fixer/textures/shaders_workaround.png rename to src/main/resources/assets/shadersfixer/textures/shaders_workaround.png diff --git a/src/main/resources/mixins.fixer.json b/src/main/resources/mixins.fixer.json index 0a43db5..3669047 100644 --- a/src/main/resources/mixins.fixer.json +++ b/src/main/resources/mixins.fixer.json @@ -1,31 +1,31 @@ { "required": true, "minVersion": "0.8.5-GTNH", - "package": "com.kotmatross.fixer.mixins", - "plugin": "com.kotmatross.fixer.asm.OptimizedMixinPlugin", + "package": "com.kotmatross.shadersfixer.mixins", + "plugin": "com.kotmatross.shadersfixer.asm.OptimizedMixinPlugin", "refmap": "mixins.fixer.refmap.json", "target": "@env(DEFAULT)", "compatibilityLevel": "JAVA_8", "mixins": [], "client": [ - "client.FiskHeroes.MixinBeamRendererLightning", - "client.FiskHeroes.MixinBeamRendererLine", - "client.FiskHeroes.MixinBulletProjectileRenderer", - "client.FiskHeroes.MixinEffectTentacles", - "client.FiskHeroes.MixinEntitySHSpellWaveFX", - "client.FiskHeroes.MixinProjectileRenderHandler", - "client.FiskHeroes.MixinRenderEarthCrack", - "client.FiskHeroes.MixinRenderEnergyBolt", - "client.FiskHeroes.MixinRenderGrappleRope", - "client.FiskHeroes.MixinRenderGrapplingHook", - "client.FiskHeroes.MixinRenderGravityWave", - "client.FiskHeroes.MixinRenderSonicWave", - "client.FiskHeroes.MixinRenderSpellWhip", - "client.FiskHeroes.MixinRenderSuitFabricator", - "client.FiskHeroes.MixinShapeFormatCircles", - "client.FiskHeroes.MixinShapeFormatLines", - "client.FiskHeroes.MixinShapeFormatWireframe", - "client.FiskHeroes.MixinSHRenderHooks" + "client.FiskHeroes.client.pack.json.beam.MixinBeamRendererLightning", + "client.FiskHeroes.client.pack.json.beam.MixinBeamRendererLine", + "client.FiskHeroes.client.render.projectile.MixinBulletProjectileRenderer", + "client.FiskHeroes.client.render.effect.MixinEffectTentacles", + "client.FiskHeroes.client.particle.MixinEntitySHSpellWaveFX", + "client.FiskHeroes.client.render.projectile.MixinProjectileRenderHandler", + "client.FiskHeroes.client.render.entity.effect.MixinRenderEarthCrack", + "client.FiskHeroes.client.render.entity.projectile.MixinRenderEnergyBolt", + "client.FiskHeroes.client.render.entity.MixinRenderGrappleRope", + "client.FiskHeroes.client.render.entity.projectile.MixinRenderGrapplingHook", + "client.FiskHeroes.client.render.entity.effect.MixinRenderGravityWave", + "client.FiskHeroes.client.render.entity.projectile.MixinRenderSonicWave", + "client.FiskHeroes.client.render.entity.projectile.MixinRenderSpellWhip", + "client.FiskHeroes.client.render.tile.MixinRenderSuitFabricator", + "client.FiskHeroes.client.pack.json.shape.MixinShapeFormatCircles", + "client.FiskHeroes.client.pack.json.shape.MixinShapeFormatLines", + "client.FiskHeroes.client.pack.json.shape.MixinShapeFormatWireframe", + "client.FiskHeroes.client.MixinSHRenderHooks" ], "server": [] } diff --git a/src/main/resources/mixins.shadersfixer.json b/src/main/resources/mixins.shadersfixer.json new file mode 100644 index 0000000..de9df95 --- /dev/null +++ b/src/main/resources/mixins.shadersfixer.json @@ -0,0 +1,12 @@ +{ + "required": true, + "minVersion": "0.8.5-GTNH", + "package": "com.kotmatross.shadersfixer.mixins", + "plugin": "com.kotmatross.shadersfixer.asm.OptimizedMixinPlugin", + "refmap": "mixins.shadersfixer.refmap.json", + "target": "@env(DEFAULT)", + "compatibilityLevel": "JAVA_8", + "mixins": [], + "client": [], + "server": [] +}