From 0847c4c40e25acd396826eafcac0d250bf7d9da8 Mon Sep 17 00:00:00 2001 From: polarbub <71790726+polarbub@users.noreply.github.com> Date: Sun, 15 Jan 2023 17:21:03 -0600 Subject: [PATCH] Do some cleanup and bump version --- build.gradle | 4 +-- gradle.properties | 6 ++-- src/main/java/protosky/WorldGenUtils.java | 17 ++++------- .../protosky/mixins/ChunkStatusMixin.java | 7 ++--- .../mixins/EnderDragonFightMixin.java | 8 ----- .../testing/SwampHutGeneratorMixin.java | 5 +--- .../protosky/stuctures/StructureHelper.java | 28 ++++++------------ .../protosky/testing/findMovedStructure.java | 2 -- .../resources/assets/protosky/protoIcon.png | Bin 0 -> 18785 bytes src/main/resources/fabric.mod.json | 6 ++-- src/main/resources/protosky.accesswidener | 1 - 11 files changed, 23 insertions(+), 61 deletions(-) create mode 100644 src/main/resources/assets/protosky/protoIcon.png delete mode 100644 src/main/resources/protosky.accesswidener diff --git a/build.gradle b/build.gradle index 540ac99..4cdb324 100644 --- a/build.gradle +++ b/build.gradle @@ -60,6 +60,4 @@ jar { } } -loom { - accessWidenerPath = file("src/main/resources/protosky.accesswidener") -} \ No newline at end of file +loom {} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 2cf8204..e3deb09 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,10 +6,10 @@ org.gradle.jvmargs=-Xmx1G minecraft_version=1.19.2 yarn_mappings=1.19.2+build.17 -loader_version=0.14.9 -fabric_version=0.61.0+1.19.2 +loader_version=0.14.12 +fabric_version=0.72.0+1.19.2 # Mod Properties -mod_version = 1.1.9 +mod_version = 1.1.10 maven_group = protosky archives_base_name = protosky diff --git a/src/main/java/protosky/WorldGenUtils.java b/src/main/java/protosky/WorldGenUtils.java index 39376d3..5d6e390 100644 --- a/src/main/java/protosky/WorldGenUtils.java +++ b/src/main/java/protosky/WorldGenUtils.java @@ -15,20 +15,14 @@ import net.minecraft.util.math.random.RandomSeed; import net.minecraft.util.math.random.Xoroshiro128PlusPlusRandom; import net.minecraft.util.registry.RegistryEntry; -import net.minecraft.world.*; +import net.minecraft.world.Heightmap; +import net.minecraft.world.World; import net.minecraft.world.biome.Biome; -import net.minecraft.world.chunk.Chunk; -import net.minecraft.world.chunk.ChunkSection; -import net.minecraft.world.chunk.PalettedContainer; -import net.minecraft.world.chunk.ProtoChunk; -import net.minecraft.world.chunk.ReadableContainer; -import protosky.stuctures.PillarHelper; -import protosky.stuctures.StructureHelper; +import net.minecraft.world.chunk.*; import protosky.mixins.ProtoChunkAccessor; -import java.util.*; - -import static protosky.ProtoSkySettings.LOGGER; +import java.util.Map; +import java.util.Optional; public class WorldGenUtils { @@ -66,7 +60,6 @@ public static void clearEntities(ProtoChunk chunk, ServerWorld world) { } else { chunk.getEntities().removeIf(tag -> { String id = tag.getString("id"); - LOGGER.info(id); return !id.equals("minecraft:end_crystal") && !id.equals("minecraft:shulker") && !id.equals("minecraft:item_frame"); }); } diff --git a/src/main/java/protosky/mixins/ChunkStatusMixin.java b/src/main/java/protosky/mixins/ChunkStatusMixin.java index 642fecb..7971dbb 100644 --- a/src/main/java/protosky/mixins/ChunkStatusMixin.java +++ b/src/main/java/protosky/mixins/ChunkStatusMixin.java @@ -6,10 +6,10 @@ import net.minecraft.structure.StructureTemplateManager; import net.minecraft.world.ChunkRegion; import net.minecraft.world.Heightmap; +import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.ChunkStatus; import net.minecraft.world.chunk.ProtoChunk; -import net.minecraft.world.gen.chunk.Blender; import net.minecraft.world.gen.chunk.ChunkGenerator; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -19,7 +19,6 @@ import protosky.WorldGenUtils; import protosky.stuctures.PillarHelper; import protosky.stuctures.StructureHelper; -import net.minecraft.world.World; import java.util.EnumSet; import java.util.List; @@ -76,12 +75,10 @@ private static void HEIGHTMAPS(ChunkStatus targetStatus, ServerWorld world, Chun ci.cancel(); } - /*@Inject(method = "method_17033", at = @At("HEAD"), cancellable = true) + @Inject(method = "method_17033", at = @At("HEAD"), cancellable = true) //This is under ChunkStatus SPAWN. To find the inject method you need to read the bytecode. //Spawning entities should be skipped here private static void SPAWN(ChunkStatus targetStatus, ServerWorld world, ChunkGenerator generator, List chunks, Chunk chunk, CallbackInfo ci) { ci.cancel(); } - */ - } \ No newline at end of file diff --git a/src/main/java/protosky/mixins/EnderDragonFightMixin.java b/src/main/java/protosky/mixins/EnderDragonFightMixin.java index 9852c40..6d243a9 100644 --- a/src/main/java/protosky/mixins/EnderDragonFightMixin.java +++ b/src/main/java/protosky/mixins/EnderDragonFightMixin.java @@ -1,16 +1,12 @@ package protosky.mixins; -import net.minecraft.block.pattern.BlockPattern; import net.minecraft.entity.boss.dragon.EnderDragonFight; import net.minecraft.util.math.BlockPos; -import org.slf4j.Logger; -import org.spongepowered.asm.mixin.Final; 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; -import protosky.ProtoSkySettings; @Mixin(EnderDragonFight.class) public class EnderDragonFightMixin @@ -18,13 +14,9 @@ public class EnderDragonFightMixin @Shadow private BlockPos exitPortalLocation; - - @Shadow @Final private static Logger LOGGER; - @Inject(method = "generateEndPortal(Z)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/gen/feature/EndPortalFeature;generateIfValid(Lnet/minecraft/world/gen/feature/FeatureConfig;Lnet/minecraft/world/StructureWorldAccess;Lnet/minecraft/world/gen/chunk/ChunkGenerator;Lnet/minecraft/util/math/random/Random;Lnet/minecraft/util/math/BlockPos;)Z", shift = At.Shift.BEFORE)) //@Inject(method = "generateEndPortal(Z)V", at = @At("HEAD")) private void adjustExitPortalLocation(boolean open, CallbackInfo ci) { - LOGGER.info("ran"); //if (this.exitPortalLocation.getY() < 2) //exitPortalLocation = exitPortalLocation.up(2 - exitPortalLocation.getY()); //exitPortalLocation = new BlockPos(exitPortalLocation.getX(), 2, exitPortalLocation.getZ()); diff --git a/src/main/java/protosky/mixins/testing/SwampHutGeneratorMixin.java b/src/main/java/protosky/mixins/testing/SwampHutGeneratorMixin.java index 7d48cb8..e5eca60 100644 --- a/src/main/java/protosky/mixins/testing/SwampHutGeneratorMixin.java +++ b/src/main/java/protosky/mixins/testing/SwampHutGeneratorMixin.java @@ -33,10 +33,7 @@ void generate(StructureWorldAccess world, StructureAccessor structureAccessor, C SwampHutGenerator This = ((SwampHutGenerator)(Object)this); ShiftableStructurePieceInvoker shiftableStructurePieceInvoker = ((ShiftableStructurePieceInvoker) This); - if (shiftableStructurePieceInvoker.invokeAdjustToAverageHeight(world, chunkBox, 0)) { - System.out.println("hi"); - } - + shiftableStructurePieceInvoker.invokeAdjustToAverageHeight(world, chunkBox, 0); ci.cancel(); } } diff --git a/src/main/java/protosky/stuctures/StructureHelper.java b/src/main/java/protosky/stuctures/StructureHelper.java index 205397d..b728c93 100644 --- a/src/main/java/protosky/stuctures/StructureHelper.java +++ b/src/main/java/protosky/stuctures/StructureHelper.java @@ -1,51 +1,41 @@ package protosky.stuctures; import com.google.common.collect.ImmutableMap; +import it.unimi.dsi.fastutil.objects.ObjectArraySet; +import net.minecraft.SharedConstants; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.EndPortalFrameBlock; -import net.minecraft.fluid.FluidState; -import net.minecraft.loot.LootTables; import net.minecraft.structure.*; import net.minecraft.structure.processor.BlockIgnoreStructureProcessor; import net.minecraft.structure.processor.BlockRotStructureProcessor; -import net.minecraft.tag.BlockTags; -import net.minecraft.tag.FluidTags; import net.minecraft.util.BlockMirror; import net.minecraft.util.BlockRotation; -import net.minecraft.util.math.*; -import net.minecraft.world.*; -import org.apache.commons.lang3.tuple.MutablePair; -import org.apache.commons.lang3.tuple.Pair; -import it.unimi.dsi.fastutil.objects.ObjectArraySet; -import net.minecraft.SharedConstants; import net.minecraft.util.Identifier; import net.minecraft.util.crash.CrashException; import net.minecraft.util.crash.CrashReport; +import net.minecraft.util.math.*; import net.minecraft.util.math.random.ChunkRandom; import net.minecraft.util.math.random.Random; import net.minecraft.util.math.random.RandomSeed; import net.minecraft.util.math.random.Xoroshiro128PlusPlusRandom; import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.RegistryEntry; +import net.minecraft.world.Heightmap; +import net.minecraft.world.StructureWorldAccess; +import net.minecraft.world.WorldAccess; import net.minecraft.world.biome.Biome; import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.ChunkSection; import net.minecraft.world.gen.GenerationStep; import net.minecraft.world.gen.StructureAccessor; import net.minecraft.world.gen.chunk.ChunkGenerator; -import net.minecraft.world.gen.feature.PlacedFeature; import net.minecraft.world.gen.feature.util.PlacedFeatureIndexer; import net.minecraft.world.gen.structure.Structure; -import protosky.mixins.StructureHelperInvokers.ChunkGeneratorInvoker; -import protosky.mixins.StructureHelperInvokers.ShiftableStructurePieceInvoker; -import protosky.mixins.StructureHelperInvokers.StructurePieceInvoker; -import protosky.mixins.StructureHelperInvokers.StructureStartInvoker; +import org.apache.commons.lang3.tuple.MutablePair; +import org.apache.commons.lang3.tuple.Pair; +import protosky.mixins.StructureHelperInvokers.*; import protosky.mixins.StructurePieceAccessor; -import protosky.mixins.StructureHelperInvokers.IglooGeneratorPieceInvoker; -import protosky.mixins.StructureHelperInvokers.SimpleStructurePieceInvoker; -import protosky.mixins.StructureHelperInvokers.ShipwreckGeneratorPieceInvoker; -import protosky.mixins.StructureHelperInvokers.OceanRuinGeneratorPieceInvoker; import java.util.*; import java.util.function.Supplier; diff --git a/src/main/java/protosky/testing/findMovedStructure.java b/src/main/java/protosky/testing/findMovedStructure.java index 1b19a03..5517040 100644 --- a/src/main/java/protosky/testing/findMovedStructure.java +++ b/src/main/java/protosky/testing/findMovedStructure.java @@ -1,10 +1,8 @@ package protosky.testing; import com.mojang.brigadier.context.CommandContext; -import com.mojang.brigadier.exceptions.DynamicCommandExceptionType; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback; -import net.fabricmc.fabric.api.event.lifecycle.v1.CommonLifecycleEvents; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents; import net.minecraft.command.argument.EntityArgumentType; import net.minecraft.command.argument.RegistryKeyArgumentType; diff --git a/src/main/resources/assets/protosky/protoIcon.png b/src/main/resources/assets/protosky/protoIcon.png new file mode 100644 index 0000000000000000000000000000000000000000..eabf4cfcc607dbdb7734c4deea26bf893f5d228c GIT binary patch literal 18785 zcmV)UK(N1wP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>DNcKrYK~#8NjlFlY zpI3P%DyyEO)1}jkbehgN>b+N6%~i#cdy_5q1~#@V7i<|zt{CI7L$#?lkP8743?Z}x zFfAAoU}losm30aEBWvc)T{8(xS%7cWd!Oemd++aej+6Q0U3>4hm)*Ya_Z?~4n{U1; zzx~Z`|eM8Blh@=OActHiyP{Qs7Y zDRhP0o1oR|D92OjFXgAi74~X*C)xX*{PwrMm1)2HLW zX?0RRt3~Q&5?ZAmErDa}w<^AFhV|>C4I0Kqi*cr@9@1RKYy@u&-urW1F6k(BD_^tr z=guOZ;p)AwW6;fp<6J)ZUqFQqI>L_>PoYs*IEbj88q;=lcw<) zf9P)~trfJ^LauBfr@pEU>jz)SUxDz^A#7?t;!3`heBKAm@(}ne&m!;Ndx1>*`&8ih zAXwm*I2S4tSULdZfv?h>UeI)`I*rG`X_^?9ak}CXujw|r1w^_gTZ1>yzT3#UNV7Hy zM_PMppV@ZEb_>3m_>&Lb#w00iWPUGp;Y-MdJSU9G&<^eC*yzTSeKH;1635sbXZ9Um zv|Q2q_MGnp9$PLAv)f!*2)om6z=RF2V=qG4*W@c-vRkWu>t@;Q`A zQ602f&{f`LLRZifDzRjG=t_lgDCNQ*ruF+S53dM$^E*LB#~ z^t_cmlV?BYHx>97zhHq^NK@T>oxSR82)I%+6s^&eFBu8NRi3~_VS=s@j;Vac=K$Ci zI6&edU2RxV0#ArZ*6v%Wu1HO~`|Etwe%2rT%ny0$@EAfyp-8C3VLD6QQaR^}qh7+>NAofj}IFfUn4##cyV-Ml>eRRQ{FZB@GxI!7qR8(paWOtB79aJZF4`{20vO|T&_cDY3#BZ8*Nd>^cbzGPYbMPuol?PU{hoa zG#F0WcARNBAa{s3fSt8&h+}Tk;8S_xNT;0Bjn@J*$7|?r)9`Ga$6Mud`{qkdYP8|2 z7M0`hFX%DWzWJPWuLn|-Xf3clCV>%3W2;t!#8Jqd%|;E3kNuEwTuonPy{+^qm+X|hlW_()K$A6`@q`Zy zItQENDdS_s`J^!!;;f+Icj8w*8^?K{<9B{Q+)Gr3ektAhI{BzWA^bHkTgIpS2}fN8 zFYOoffZ$U)?E=RF?@y0O8_JR$88j@P~?Rl)mhOKDgt73tv>$@sZdlutD^*{m`lYQO4ysE@LQdRv=^mswYiKrz=lPZs;JN z@_N6*XRX<#uZ2ygCAzl6LwAuci-X6gjce<~SEc)QpXaw|6j&dVsK5iviqLm_nuR(h zkMnYz_zND#C7Sjf55Cv|0U7f>z6Gt6KHf($yD} zuLb1|I)Jg5EcvaCVrf6oNRazH=) zQa&$Q=C?NSAs1Xl>W@RIEA<^hujab&C(%RRCp97B2^#Iz?p%g1wrIU%@j2LkY%rzX zl9>vULIX3D71C%vV~{{3w@gm(s62G(cH;7O^CpksREP59eyNN7Nd@BAaS88o><6Fr z-JXu!htzjHvo<{@#fy%H*}P=A zaVXIqC+TyNM48)?EQ*lM@Ff$8y;RoGHc-3DP>w@alP zPWinJS@VPP#%H{?0&ML3lnZd#iVxne%~QoMj;S+nv=ug$R>-B+cmf~x4SXk5z5>)% zx6GZ@RxPmoTu6qh0F}m;N_y%?u=&-qj) z^D0esI!EZ*&Ewef!YXS;gYA*+1 za^5dMWfQO2ig7xlT~2+WAH>mb;ym%$SF<^(A9_M3@CuPs^lintzL*3qZ?YDv;X`*o z9w&dDFWD!p;4N(@s2v0JMMrGWOD0z8j}75S$w-`DxHwitxlpx^hVjs2t@CosexjHB zH8vwrt|QTE0tsK4WJ?P1Ca1a!o&>ZPx|I)O<*V|P@}|3ZbPK)$60XL_WDor~V~rn2 zA)nQi$MTSJ%lOGt@CVrTUDyLCFZ+%GHeq*s+;#1%Ve-wmXK zYto#@6J5&1s!~VQXz=I2jKAP1>?c0eZLQHFI0N?6t42>iqPyPgr}cx!_zHUXqJ85h zF0~Ho17)a>dZ<(N0#AR*?=+R+?U#HtdJ{eM4H7=-$g*r}FJU2PdabRS-fWjFy+s!V zo>Z)G7=0?v4mpn+a~Tg*`2$>s@lM@_z2Kk36MY@$z|ut!pcgIhnSWJ2<$-Qp%}zI- zkTv@$zG6(C$xju=7dX?0G4VwV#D!lbLwxvUb_`tJ<-(5oQs8y0zPS$SY{b~*sXrd+ z_>Ht~(YAtDT7i=yKomvCZiK-kr)rF=VV7|Sr=qFeg04=%;Z&^9n|RD|^Qo3bJdXe` zOhL0)Otv~UU!r*I#}2~8X-homN!DbN9C4b|pyyV>^(6?p>ZV->#Zjipm;E4L=nlV} zKk=Gx$+qJw-(=~VEPqv*XRQaN226Q!#GSFWYD{t9jSES3%J_|sIOAmy?Ja#qS9xr= zuAh8{x4xa_=1Zdan6k-d^jo2)L7}?>jhOL-x%FK#XHKUyqi@HF=?tJg^WA8644D3C ztsg+2oen!0XMA}QW*f>Iu|OvL*9k|u(^CEv%ud)+S&k{=lZEkD9+M{GlH~#_6f@Kv z)8Yk9$Ltq|k`p#&oB4~@`OJBn#Y&@tD0-|Ao4uCY?6}F=wnsh#?f_+Qd~e+iSTlbB z(C;uHD*;O&w*&>J76)~NKjuSBc=JgoQ_*TH(T_3p0J85n4 zn$j(hlAd)G{Za>YvUMJ%xz47!T{3M}yR2yLldrAVAm3cQS-!D)qx|`rjq>FcYvq-} zF?n@-LjLi&D@6YIZh7I_T{3NEJ65;rq8`;>_~THq3A!FD^sn$IKqsB^O{uHMWB8xi z;7hSvtGkHj;os89zhTOktm5awY7o9%0CEtV%?1@-CMb;45cp#j8a=Ph2%-{<>NK3T zp-acs*U6wX@&yE6kF;RBUDCf$cCQ$ht5z+RA8uPO|6%(E`SGSr@}u=zU2 zg`SGu1bJ**x9bc@dE?mng#4Ecyku#C?W@XQpg<^8#~fz{irMMKBm{5hNV)=7lMK`A zy4{B9u{Mr?(tgmjuVX6)`DV_VFYh|KP2}_U$eW+IP2Rk#U;gFzEcwL+}N^sjcNI>&c+^ z3DTV}%b<1sL~~oo57G;s1db;US8!2a+@k$WR;^HpOZ`Y{1n9;{52s81{?*U0`QpTdViF8Bf$ab?-UhUYG| zP7fKy7x}e5Y2-286&is3N#8~53Rb54_9_f1z6QeCG^Ru96!>Yx6JiPA1;L*OgP%0* z2fsONI7?da+Jwr9RG(Z|X>&$huN<3b7rFB+kvpb|+zz;Fn*8IzF?oIUF8MLG>wmdv z255kf9uxV-Bl4r$_Q^}F^W}-I9_fWX7C70aU$o&+!D)OM?3V4vQsC9kn1lwZ1ODb% zYw#KiWFQ+lX*21iPM3+;O*eHqps!zau)y)EQZHFbG=*W@lx0D-idUX67I>3S2A!{z zQ%3^_P(3;}FnzYlLtibA>LM=2n#5k2-Oww0`#R+NyQa(QJI|6I@0lw<+utbPT)$BM zU}&j)d+&M_zggsF6#n7mBF}A=Z(TSdkIrtC+neS|b5pO(g`Q?4znQlE*<2y)d0`?S zLDzBe+4|wDPKGoF6!HnLa@K||h3FUYMw`KI*l`Kt1etOLCj)4yFr3jbX~`LQMwZC#VBZ0nNcZQU{qTZ4^Vc+_&+5f@`-4hS4i z0r4hDW2n$W=_i(dZ*xo7+FKCkQ zEt@4@9-kv8>Ko*qnGLe4u~V8NCby}5wkcKuXyHG7E@BCp#Or$4&s%W0B?sMdL|oQE zo5mYF=~1oZ!I%Z!zvqH-1;=BO6(*ci92A@E| z^1$@ja{tUaIXSCd-accFTsUo-oC_FgXqQ&lV8Oy}_+b82V@&-bU)479;^XLRj2sty z)Rl5oK#gw0MCq;1@Fy2HpCh14!DA($c3U`3#y!L@Vaa` zX}HWsh%H)eIF4fr(#HzLIphJCI|PBNY$49e^Reo<`i`_W%2BS;o>n>1*Cq$%H_9I1 z4@?Jb#x&VCW4at{Z;~V3ZE}dvH%~5Toh$pnvl*+nwWVKLTKcrOv~Bl;$*V-ceGY#U z4e^?vhO@$RoF5l8KIH*`7P3iK6grK)&s@6hkgxSGeRQW=GzuJl0A4aDU}9acgml*U zxZ-5#7+Viifiw*`=*FMqmF~2nO+cQ)AO2X-0a#quCd=wtWJOE6ESc9O%GeLx=QWqJ&=x(5v=KfbUwcBEge* zlrQLcoN`NAktZA5q~N%W&*-@(=9|-9zRW#k?ZfxZmG4CQ$#br9Ju#gLy=PN#hAgHd82^)l%0BOv>Z15Ky z`g?HtS9UTZe^X5ks#1cFr+^4tp_s86kn0Hu{)!BNNrP;5o^qL|;*ZO>V%&(8*aR2? ze&3vCdE3m{auVC|Bg>b`GaEL@sg3L9{(Yd}TRaS99{s3Stw$=*)q&){i{a#+mdh zguK}*bp)^JFr0zeCg?|Z<(n+~Y?gwdBs*XQHYb9{XHXhRGo3t+D|w9{ebrIbUGijL zK&~frJA_QEv^uQV4$S<`eZz9a@>TM#VR`5EN96Z5tdVD%TjWG@vz%DJ9+O~$obKwBC&7Dv3oc&03uR6Ji1fDg z>EvmKz4$Od3y^$5TazDKeKr1j;S%V7t85$_sN+(d*lpg@4+g6bbMUi zv39N8vuc$*Ja3*njTL=*#teC6WLO^EwoUF{zd_C)9+UC*emw@}`fic_+L3uGV?rCT zXrJ*ZkHw+!`|2#gFkn^%%3M8!YX}a`Eq$^>sEPW z#}0W2@HDpN$0sJ_PMon1G&ad2%a+KammZKu51uC{!S}%C&GKx2zq~X&EYI%RCGTFc zL>>hHygD>gX&v+xNd&4wRr6* zAm=6GGu|S;z^N?TpfN|bQ%&Mkurs@Y1FzPNx&V`YY>0oOqpHjdq(Ui}!7vmwEi4T< zpV0vR0tVZ}bV za-}?u6?`8G`66_Fm@68^J^>nWC$VKe*wG;mqv%gzJAZM@W_f1UPB}0ztUHMn!QzOR zQe133;fiM-bdo!rv1-2n)kl1$2ftp#YGugpGA3vENq^Z8UsaN5j+n5nA~zP!Dvv8P zL-F<{ZxL#YMRh*wo8AoBA>|>Cw%tC9+m4`ap5G}iwKU7Ax;nWJTkDfUL-IV}V@UqT zQP2;d7@z9tkq@JP5=FWLv;z&*gby4oF=&D z$)FNHV=Ex?RKYm}Jzk3B#WPt(d1-_Eq_YNiq^-Q@C@)zi06|SM$5yz6ue7E#@zaUI zahniXr#Ud0&**)n+% zMScvc`UFm1FHY zK62+gG2sJ@UW+rl=`y)wLv?@;G~J>nU9yt0$%?acrYI>@V>SUSpe&dBRxky}Ct4vB zGu3!Zj*mf`W;e*SD8MzXt#TYmK7sA^Jt)LOfRk9MPov2H4y)`1Y{!pcb)Lc*`_T67 z@;tWQFRflHFXFOvA8;pdvwj{E;M3UBpTp|BANa?xTAxRePh(qu1S|Ss=zazh=mqF` z8ijrc6XYG3JiL{khHct9hMi<&?mTI2wePv z;K_L`fO&J>xfa$ZuI7sl7TBJHGo!UkatM_WJh>0N2cNe}mcG{Hj~$vX2c76;OsP-4A~xWnZ)2k=UU8+@?`yx;W)j`^07gY59*9uPlcmi zyz_H6@9bw%0D>Uzeo_RfJ@V1~GZfKW%)6SCJ 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index ad681ed..1d01e45 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -16,10 +16,8 @@ }, "license": "CC0-1.0", - "icon": "assets/protosky/icon.png", - + "icon": "assets/protosky/protoIcon.png", "environment": "*", - "accessWidener": "protosky.accesswidener", "entrypoints": { "main": [ "protosky.fixWorldLoads" @@ -34,7 +32,7 @@ "depends": { "minecraft": ">=1.19.2", - "fabricloader": ">=0.14.9", + "fabricloader": ">=0.14.12", "fabric-api": "*", "java": ">=17" } diff --git a/src/main/resources/protosky.accesswidener b/src/main/resources/protosky.accesswidener deleted file mode 100644 index 4ad1f07..0000000 --- a/src/main/resources/protosky.accesswidener +++ /dev/null @@ -1 +0,0 @@ -accessWidener v1 named \ No newline at end of file