From d247d5e93d83fe132e760105c7c11b85cd5f04b3 Mon Sep 17 00:00:00 2001 From: IThundxr Date: Thu, 30 Jan 2025 21:06:32 -0500 Subject: [PATCH 1/2] Copperless - Remove legacy copper resource pack --- .../foundation/events/CommonEvents.java | 37 ++++++++---------- .../minecraft/models/block/copper_block.json | 6 --- .../models/block/exposed_copper.json | 6 --- .../models/block/oxidized_copper.json | 6 --- .../models/block/weathered_copper.json | 6 --- .../minecraft/textures/block/copper_block.png | Bin 610 -> 0 bytes .../minecraft/textures/block/cut_copper.png | Bin 556 -> 0 bytes .../textures/block/exposed_copper.png | Bin 230 -> 0 bytes .../textures/block/exposed_cut_copper.png | Bin 176 -> 0 bytes .../textures/block/oxidized_copper.png | Bin 459 -> 0 bytes .../textures/block/oxidized_cut_copper.png | Bin 454 -> 0 bytes .../textures/block/weathered_copper.png | Bin 230 -> 0 bytes .../textures/block/weathered_cut_copper.png | Bin 176 -> 0 bytes .../minecraft/textures/item/copper_ingot.png | Bin 228 -> 0 bytes .../resourcepacks/legacy_copper/pack.mcmeta | 6 --- .../resourcepacks/legacy_copper/pack.png | Bin 228 -> 0 bytes 16 files changed, 16 insertions(+), 51 deletions(-) delete mode 100644 src/main/resources/resourcepacks/legacy_copper/assets/minecraft/models/block/copper_block.json delete mode 100644 src/main/resources/resourcepacks/legacy_copper/assets/minecraft/models/block/exposed_copper.json delete mode 100644 src/main/resources/resourcepacks/legacy_copper/assets/minecraft/models/block/oxidized_copper.json delete mode 100644 src/main/resources/resourcepacks/legacy_copper/assets/minecraft/models/block/weathered_copper.json delete mode 100644 src/main/resources/resourcepacks/legacy_copper/assets/minecraft/textures/block/copper_block.png delete mode 100644 src/main/resources/resourcepacks/legacy_copper/assets/minecraft/textures/block/cut_copper.png delete mode 100644 src/main/resources/resourcepacks/legacy_copper/assets/minecraft/textures/block/exposed_copper.png delete mode 100644 src/main/resources/resourcepacks/legacy_copper/assets/minecraft/textures/block/exposed_cut_copper.png delete mode 100644 src/main/resources/resourcepacks/legacy_copper/assets/minecraft/textures/block/oxidized_copper.png delete mode 100644 src/main/resources/resourcepacks/legacy_copper/assets/minecraft/textures/block/oxidized_cut_copper.png delete mode 100644 src/main/resources/resourcepacks/legacy_copper/assets/minecraft/textures/block/weathered_copper.png delete mode 100644 src/main/resources/resourcepacks/legacy_copper/assets/minecraft/textures/block/weathered_cut_copper.png delete mode 100644 src/main/resources/resourcepacks/legacy_copper/assets/minecraft/textures/item/copper_ingot.png delete mode 100644 src/main/resources/resourcepacks/legacy_copper/pack.mcmeta delete mode 100644 src/main/resources/resourcepacks/legacy_copper/pack.png diff --git a/src/main/java/com/simibubi/create/foundation/events/CommonEvents.java b/src/main/java/com/simibubi/create/foundation/events/CommonEvents.java index 3aa6ed22a7..b61ef115c0 100644 --- a/src/main/java/com/simibubi/create/foundation/events/CommonEvents.java +++ b/src/main/java/com/simibubi/create/foundation/events/CommonEvents.java @@ -18,7 +18,6 @@ import com.simibubi.create.content.redstone.link.controller.LinkedControllerServ import com.simibubi.create.content.trains.entity.CarriageEntityHandler; import com.simibubi.create.foundation.pack.DynamicPack; import com.simibubi.create.foundation.pack.DynamicPackSource; -import com.simibubi.create.foundation.pack.ModFilePackResources; import com.simibubi.create.foundation.recipe.RecipeFinder; import com.simibubi.create.foundation.recipe.RuntimeDataGenerator; import com.simibubi.create.foundation.utility.ServerSpeedProvider; @@ -26,18 +25,16 @@ import com.simibubi.create.foundation.utility.TickBasedCache; import com.simibubi.create.infrastructure.command.AllCommands; import net.createmod.catnip.data.WorldAttached; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.MutableComponent; import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.packs.PackType; import net.minecraft.server.packs.repository.Pack; -import net.minecraft.server.packs.repository.PackSource; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelAccessor; + import net.minecraftforge.common.capabilities.RegisterCapabilitiesEvent; import net.minecraftforge.event.AddPackFindersEvent; import net.minecraftforge.event.AddReloadListenerEvent; @@ -59,10 +56,7 @@ import net.minecraftforge.event.level.LevelEvent; import net.minecraftforge.event.server.ServerStoppingEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.LogicalSide; -import net.minecraftforge.fml.ModList; import net.minecraftforge.fml.common.Mod.EventBusSubscriber; -import net.minecraftforge.forgespi.language.IModFileInfo; -import net.minecraftforge.forgespi.locating.IModFile; @EventBusSubscriber public class CommonEvents { @@ -213,20 +207,21 @@ public class CommonEvents { @SubscribeEvent public static void addPackFinders(AddPackFindersEvent event) { - if (event.getPackType() == PackType.CLIENT_RESOURCES) { - IModFileInfo modFileInfo = ModList.get().getModFileById(Create.ID); - if (modFileInfo == null) { - Create.LOGGER.error("Could not find Create mod file info; built-in resource packs will be missing!"); - return; - } - IModFile modFile = modFileInfo.getFile(); - event.addRepositorySource(consumer -> { - Pack pack = Pack.readMetaAndCreate(Create.asResource("legacy_copper").toString(), Component.literal("Create Legacy Copper"), false, id -> new ModFilePackResources(id, modFile, "resourcepacks/legacy_copper"), PackType.CLIENT_RESOURCES, Pack.Position.TOP, PackSource.BUILT_IN); - if (pack != null) { - consumer.accept(pack); - } - }); - } + // Uncomment and rename pack to add built in resource packs +// if (event.getPackType() == PackType.CLIENT_RESOURCES) { +// IModFileInfo modFileInfo = ModList.get().getModFileById(Create.ID); +// if (modFileInfo == null) { +// Create.LOGGER.error("Could not find Create mod file info; built-in resource packs will be missing!"); +// return; +// } +// IModFile modFile = modFileInfo.getFile(); +// event.addRepositorySource(consumer -> { +// Pack pack = Pack.readMetaAndCreate(Create.asResource("legacy_copper").toString(), Component.literal("Create Legacy Copper"), false, id -> new ModFilePackResources(id, modFile, "resourcepacks/legacy_copper"), PackType.CLIENT_RESOURCES, Pack.Position.TOP, PackSource.BUILT_IN); +// if (pack != null) { +// consumer.accept(pack); +// } +// }); +// } if (event.getPackType() == PackType.SERVER_DATA) { DynamicPack dynamicPack = new DynamicPack("create:dynamic_data", PackType.SERVER_DATA); diff --git a/src/main/resources/resourcepacks/legacy_copper/assets/minecraft/models/block/copper_block.json b/src/main/resources/resourcepacks/legacy_copper/assets/minecraft/models/block/copper_block.json deleted file mode 100644 index aae7159957..0000000000 --- a/src/main/resources/resourcepacks/legacy_copper/assets/minecraft/models/block/copper_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "minecraft:block/copper_block" - } -} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/legacy_copper/assets/minecraft/models/block/exposed_copper.json b/src/main/resources/resourcepacks/legacy_copper/assets/minecraft/models/block/exposed_copper.json deleted file mode 100644 index 8d02db6df5..0000000000 --- a/src/main/resources/resourcepacks/legacy_copper/assets/minecraft/models/block/exposed_copper.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "minecraft:block/exposed_copper" - } -} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/legacy_copper/assets/minecraft/models/block/oxidized_copper.json b/src/main/resources/resourcepacks/legacy_copper/assets/minecraft/models/block/oxidized_copper.json deleted file mode 100644 index 5da2d1ab78..0000000000 --- a/src/main/resources/resourcepacks/legacy_copper/assets/minecraft/models/block/oxidized_copper.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "minecraft:block/oxidized_copper" - } -} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/legacy_copper/assets/minecraft/models/block/weathered_copper.json b/src/main/resources/resourcepacks/legacy_copper/assets/minecraft/models/block/weathered_copper.json deleted file mode 100644 index aa42be792e..0000000000 --- a/src/main/resources/resourcepacks/legacy_copper/assets/minecraft/models/block/weathered_copper.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "minecraft:block/weathered_copper" - } -} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/legacy_copper/assets/minecraft/textures/block/copper_block.png b/src/main/resources/resourcepacks/legacy_copper/assets/minecraft/textures/block/copper_block.png deleted file mode 100644 index 95a4f8aa8981066624283783211bd25dd2c9eafd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 610 zcmV-o0-gPdP)EX>4Tx04R}tkv&MmKpe$iQ%gl!9PA+CkfAz=1yK=4sbUcmEM7-o<#9_qjhuSSgqc@QK88OgAjz4dR(i zOXs{#9ARZiAwDM_H|T=Ik6f2se&bwnSm2ovBb%Nlju4BbE|$BPl?|16nmDSc8s!T) zmle)ioYiWbweQJa7%FHh8LrbDMgmJnA_WmL>ZqU!i~6cSBgI6T_TwJ@A;+I0mrSk- z7&#VDg9^#?i4s zjut%v`nQ3L>y9Sx0hc?#;FB&Hk|X(P3dJJuen#Jv2L^6|zBRYE_C8J@fGl;jd;=UD z0;46$UiWx+Z+CD1o@w{@1F+EX>4Tx04R}tkv&MmKpe$iQ%gl!9PA+CkfAz=1yK=4sbUcmEM7-o<#9_qjhuSSgqc@QK88OgAjz4dR(i zOXs{#9ARZiAwDM_H|T=Ik6f2se&bwnSm2ovBb%Nlju4BbE|$BPl?|16nmDSc8s!T) zmle)ioYiWbweQJa7%FHh8LrbDMgmJnA_WmL>ZqU!i~6cSBgI6T_TwJ@A;+I0mrSk- z7&#VDg9^#?i4s zjut%v`nQ3L>y9Sx0hc?#;FB&Hk|X(P3dJJuen#Jv2L^6|zBRYE_C8J@fGl;jd;=UD z0;46$UiWx+Z+CD1o@w{@1F+7#Ani(}YxTEt^guvAK( zN=1x7K!j9E<^TWyK1oDDRCwBBFg7+e1z`pU21Zd3W^ham6$N4-BgI)1h=Gg{6Hy=r uGJ>5|L72fwP)HSo8Pdzk%R!i0<^TZ7^&N$QfND|z0000ZobvT6w{n^_sC=~k9hC6!(V|K80zopr0Q<@`ga7~l diff --git a/src/main/resources/resourcepacks/legacy_copper/assets/minecraft/textures/block/oxidized_copper.png b/src/main/resources/resourcepacks/legacy_copper/assets/minecraft/textures/block/oxidized_copper.png deleted file mode 100644 index 68efceb554f512e598f0e8a07757bf68accca164..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 459 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJXMsm#F#`j)5C}6~x?A@LD7YoS zC&abw*s6y83+ngHtKB`jX7{X`T{A0pOfBBfU9`Tla9w-;nwE@}jcF?zQdZO_uc%L0 zUK_uxHf~u>#FDD;#g$#y+5DAR*H%iY0NuaW)5S5Q;+9O0X_AT~kL&!9 zSBdvbpDp_xe|UzanX&)kRc&=&BGVWYvzRz%ZChK0hPx_z`@UTtpvJ>{*RjdM0F%5AvWV7KM@)a{Ftg|Gf* zeHG#-(P*zO>t&KHvw9ap-r996o@&4L|G3Y#-6j6pZ@$D=y=@7$w=$jBZsnO9uKN3- y^sNH7n8Mpzmon^FwpgdX*<^70)*StI28J8UJ%78j2busq!r|w^_>qyCEoK&yylg7&MonnTkJNw*lA{w!;B)EsfE^4 z3azFTnoTS)1)>QBCKC#b`wI;FfGFRfH(#$OU$-Y;volY*HCL%MSFt5mp(R(oIajVJ zN2(!5ye?a`Hk-dPOD!(H9_Z|Yo-U3d6}NQ#Sd*Fqc+Rd?n|$T&ZT;j@=6Cg*S{?6v z_TYY%Wpeu^ZkF1??r!}1J#4mr2vhHV nhTrnXo5bu?7N&pwANSMV-b2#fDDHIt&@&94u6{1-oD!M?X~)`?LWebLU%G3r$@d_}QKk8P?1s~q@a8>Qlz7?M?g4Gfz7CCZm8pogPs8%qAik_PM<#QI3wyA1H-AWvaO8` RSs*7cc)I$ztaD0e0su$0H9G(R diff --git a/src/main/resources/resourcepacks/legacy_copper/assets/minecraft/textures/item/copper_ingot.png b/src/main/resources/resourcepacks/legacy_copper/assets/minecraft/textures/item/copper_ingot.png deleted file mode 100644 index 21ac1452b1ed9012ea0d7aec5160669754ec2f87..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 228 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFe4k|4ie28U-i(tw;q zPZ!6Kid)GC7%wS^M9=bOo-sQq=Mm#0D{W0_=GIA5dU~hyOjVMIYMs(Mb;_O95>c{K zr-Yn3y;&kEw#6px+?;twH=H?|^z4jeB)7zlAf2?bHBk&EX^}41wKnXGanK86V6do^ VVr-tRs2?GrY!R<60aV0T666=m;PC858jzFd z>EaktaVz-%qm_b)d%HLDjN3^$j~E|WX-Y~nx6bP6ojRp=>KchvhqC(RJjdUEgLMX{p>XRoeVyx2CIkvY99(*5TuR)^$eJ5$#(%|30J%~)2=SS~85 UU({N73}_jHr>mdKI;Vst08(d7MgRZ+ From c3bccb9aa4e495710025b08aa7111aa90bb78faa Mon Sep 17 00:00:00 2001 From: TropheusJ Date: Thu, 30 Jan 2025 21:28:26 -0500 Subject: [PATCH 2/2] fix placing minecart contraptions --- .../create/content/contraptions/MountedStorageManager.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/simibubi/create/content/contraptions/MountedStorageManager.java b/src/main/java/com/simibubi/create/content/contraptions/MountedStorageManager.java index a22470baca..8ff513095b 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/MountedStorageManager.java +++ b/src/main/java/com/simibubi/create/content/contraptions/MountedStorageManager.java @@ -87,7 +87,12 @@ public class MountedStorageManager { public void initialize() { if (this.isInitialized()) { - throw new IllegalStateException("Mounted storage has already been initialized"); + // originally this threw an exception to try to catch mistakes. + // however, in the case where a Contraption is deserialized before its Entity, that would also throw, + // since both the deserialization and the onEntityCreated callback initialize the storage. + // this case occurs when placing a picked up minecart contraption. + // the reverse case is fine since deserialization also resets the manager first. + return; } this.allItemStorages = ImmutableMap.copyOf(this.itemsBuilder);