From 606177d002eb2b76c45ae31909c9361dcaa5ff55 Mon Sep 17 00:00:00 2001 From: Flanks255 <32142731+Flanks255@users.noreply.github.com> Date: Wed, 23 Oct 2024 17:05:52 -0500 Subject: [PATCH] Prepping for merge. --- specialPeopleStuff.properties | 104 +++++++++--------- specialPeopleThings.properties | 64 +++++++++++ .../misc/special/ThreadSpecialFetcher.java | 3 +- 3 files changed, 117 insertions(+), 54 deletions(-) create mode 100644 specialPeopleThings.properties diff --git a/specialPeopleStuff.properties b/specialPeopleStuff.properties index ff87e9398..994e45cd6 100644 --- a/specialPeopleStuff.properties +++ b/specialPeopleStuff.properties @@ -1,64 +1,64 @@ #Because he's me -ellpeck=actuallyadditions:atomic_reconstructor +ellpeck=actuallyadditions:blockAtomicReconstructor #Because he submitted tons of ideas for the mod dqmhose=minecraft:torch #Because he does all of the textures -twoofeight=actuallyadditions:heat_collector +twoofeight=actuallyadditions:blockHeatCollector #Because she is awesome and squids are cool -larixine=actuallyadditions:black_crystal_shard +larixine=actuallyadditions:blockBlackLotus #Because he helps me with models and stuff -canitzp=actuallyadditions:coffee_machine_block +canitzp=actuallyadditions:blockCoffeeMachine #Because he's an awesome guy and helps with lots of stuff -xdjackiexd=actuallyadditions:drill_white +xdjackiexd=actuallyadditions:itemDrill@14 #Because worms -bootytoast=actuallyadditions:worm +bootytoast=actuallyadditions:itemWorm #Because he does the ActAdd doc on the FTB Wiki -xbony2=actuallyadditions:booklet +xbony2=actuallyadditions:itemBooklet #Patreon stuff # 0 = Redstone, 1 = Lapis, 2 = Diamond, 3 = Coal, 4 = Emerald, 5 = Iron -ftog_thorgal=actuallyadditions:restonia_crystal -minetechniker=actuallyadditions:empowered_diamatine_crystal -3pixel=actuallyadditions:more_damage_lens -kirindave=actuallyadditions:empowered_void_crystal -theonewhohunts=actuallyadditions:empowered_emeradic_crystal -garantiertnicht=actuallyadditions:filling_wand -heathcliff1998=actuallyadditions:empowered_emeradic_crystal -saphrym=actuallyadditions:void_crystal -lyxthegamer=actuallyadditions:empowered_emeradic_crystal -skedone=actuallyadditions:empowered_emeradic_crystal -r33s3s=actuallyadditions:empowered_diamatine_crystal -roadrunner116=actuallyadditions:emeradic_crystal -albrechtboucher=actuallyadditions:empowered_diamatine_crystal -fobok=actuallyadditions:emeradic_crystal -dankfrog=actuallyadditions:empowered_diamatine_crystal -deanwhufc=actuallyadditions:empowered_diamatine_crystal -witsend66=actuallyadditions:empowered_palis_crystal -broccoli_bob=actuallyadditions:void_crystal -dolinmyster=actuallyadditions:empowered_emeradic_crystal -savos_darkran=actuallyadditions:emeradic_crystal -flanks255=actuallyadditions:empowered_void_crystal -spectacular101=actuallyadditions:enori_crystal -scottradish=actuallyadditions:restonia_crystal -slothicornstudio=actuallyadditions:empowered_enori_crystal -mecharm=actuallyadditions:enori_crystal -DJAscendance=actuallyadditions:diamatine_crystal -SneezySchoo=actuallyadditions:restonia_crystal -Mistakin=actuallyadditions:void_crystal -Tonitch8=actuallyadditions:emeradic_crystal -Owlwix=actuallyadditions:empowered_enori_crystal -3MJoey=actuallyadditions:palis_crystal -Ridanis=actuallyadditions:hairy_ball -gefailter71=actuallyadditions:empowered_restonia_crystal -SeaSaltStar=actuallyadditions:restonia_crystal -VlaDracul3=actuallyadditions:emeradic_crystal -Anthonys_Lab=actuallyadditions:empowered_restonia_crystal -WolfgalVlad=actuallyadditions:empowered_diamatine_crystal -Water_Moon=actuallyadditions:phantom_booster -ticticboi=actuallyadditions:empowered_diamatine_crystal -The_Boo=actuallyadditions:empowered_diamatine_crystal -Cloniart47=actuallyadditions:diamatine_crystal -kei_kouma=actuallyadditions:enori_crystal -kingofaces2=actuallyadditions:emeradic_crystal -Sharkbite202020=actuallyadditions:empowered_emeradic_crystal -ArcticPrince=actuallyadditions:phantom_itemface \ No newline at end of file +ftog_thorgal=actuallyadditions:itemCrystal +minetechniker=actuallyadditions:itemCrystalEmpowered@2 +3pixel=actuallyadditions:itemMoreDamageLens +kirindave=actuallyadditions:itemCrystalEmpowered@3 +theonewhohunts=actuallyadditions:itemCrystalEmpowered@4 +garantiertnicht=actuallyadditions:itemFillingWand +heathcliff1998=actuallyadditions:itemCrystalEmpowered@4 +saphrym=actuallyadditions:itemCrystal@3 +lyxthegamer=actuallyadditions:itemCrystalEmpowered@4 +skedone=actuallyadditions:itemCrystalEmpowered@4 +r33s3s=actuallyadditions:itemCrystalEmpowered@2 +roadrunner116=actuallyadditions:itemCrystal@4 +albrechtboucher=actuallyadditions:itemCrystalEmpowered@2 +fobok=actuallyadditions:itemCrystal@4 +dankfrog=actuallyadditions:itemCrystalEmpowered@2 +deanwhufc=actuallyadditions:itemCrystalEmpowered@2 +witsend66=actuallyadditions:itemCrystalEmpowered@1 +broccoli_bob=actuallyadditions:itemCrystal@3 +dolinmyster=actuallyadditions:itemCrystalEmpowered@4 +savos_darkran=actuallyadditions:itemCrystal@4 +flanks255=actuallyadditions:itemCrystalEmpowered@3 +spectacular101=actuallyadditions:itemCrystal@5 +scottradish=actuallyadditions:itemCrystal +slothicornstudio=actuallyadditions:itemCrystalEmpowered@5 +mecharm=actuallyadditions:itemCrystal@5 +DJAscendance=actuallyadditions:itemCrystal@2 +SneezySchoo=actuallyadditions:itemCrystal@0 +Mistakin=actuallyadditions:itemCrystal@3 +Tonitch8=actuallyadditions:itemCrystal@4 +Owlwix=actuallyadditions:itemCrystalEmpowered@5 +3MJoey=actuallyadditions:itemCrystal@1 +Ridanis=actuallyadditions:itemHairyBall@0 +gefailter71=actuallyadditions:itemCrystalEmpowered@0 +SeaSaltStar=actuallyadditions:itemCrystal@0 +VlaDracul3=actuallyadditions:itemCrystal@4 +slbsh=actuallyadditions:itemCrystalEmpowered@0 +WolfgalVlad=actuallyadditions:itemCrystalEmpowered@2 +Water_Moon=actuallyadditions:blockPhantomBooster@0 +ticticboi=actuallyadditions:itemCrystalEmpowered@2 +The_Boo=actuallyadditions:itemCrystalEmpowered@3 +Cloniart47=actuallyadditions:itemCrystal@2 +kei_kouma=actuallyadditions:itemCrystal@5 +kingofaces2=actuallyadditions:itemCrystal@4 +Sharkbite202020=actuallyadditions:itemCrystalEmpowered@4 +ArcticPrince=actuallyadditions:blockPhantomface \ No newline at end of file diff --git a/specialPeopleThings.properties b/specialPeopleThings.properties new file mode 100644 index 000000000..d860b2b36 --- /dev/null +++ b/specialPeopleThings.properties @@ -0,0 +1,64 @@ +#Because he's me +ellpeck=actuallyadditions:atomic_reconstructor +#Because he submitted tons of ideas for the mod +dqmhose=minecraft:torch +#Because he does all of the textures +twoofeight=actuallyadditions:heat_collector +#Because she is awesome and squids are cool +larixine=actuallyadditions:black_crystal_shard +#Because he helps me with models and stuff +canitzp=actuallyadditions:coffee_machine_block +#Because he's an awesome guy and helps with lots of stuff +xdjackiexd=actuallyadditions:drill_white +#Because worms +bootytoast=actuallyadditions:worm +#Because he does the ActAdd doc on the FTB Wiki +xbony2=actuallyadditions:booklet + +#Patreon stuff +# 0 = Redstone, 1 = Lapis, 2 = Diamond, 3 = Coal, 4 = Emerald, 5 = Iron +ftog_thorgal=actuallyadditions:restonia_crystal +minetechniker=actuallyadditions:empowered_diamatine_crystal +3pixel=actuallyadditions:more_damage_lens +kirindave=actuallyadditions:empowered_void_crystal +theonewhohunts=actuallyadditions:empowered_emeradic_crystal +garantiertnicht=actuallyadditions:filling_wand +heathcliff1998=actuallyadditions:empowered_emeradic_crystal +saphrym=actuallyadditions:void_crystal +lyxthegamer=actuallyadditions:empowered_emeradic_crystal +skedone=actuallyadditions:empowered_emeradic_crystal +r33s3s=actuallyadditions:empowered_diamatine_crystal +roadrunner116=actuallyadditions:emeradic_crystal +albrechtboucher=actuallyadditions:empowered_diamatine_crystal +fobok=actuallyadditions:emeradic_crystal +dankfrog=actuallyadditions:empowered_diamatine_crystal +deanwhufc=actuallyadditions:empowered_diamatine_crystal +witsend66=actuallyadditions:empowered_palis_crystal +broccoli_bob=actuallyadditions:void_crystal +dolinmyster=actuallyadditions:empowered_emeradic_crystal +savos_darkran=actuallyadditions:emeradic_crystal +flanks255=actuallyadditions:empowered_void_crystal +spectacular101=actuallyadditions:enori_crystal +scottradish=actuallyadditions:restonia_crystal +slothicornstudio=actuallyadditions:empowered_enori_crystal +mecharm=actuallyadditions:enori_crystal +DJAscendance=actuallyadditions:diamatine_crystal +SneezySchoo=actuallyadditions:restonia_crystal +Mistakin=actuallyadditions:void_crystal +Tonitch8=actuallyadditions:emeradic_crystal +Owlwix=actuallyadditions:empowered_enori_crystal +3MJoey=actuallyadditions:palis_crystal +Ridanis=actuallyadditions:hairy_ball +gefailter71=actuallyadditions:empowered_restonia_crystal +SeaSaltStar=actuallyadditions:restonia_crystal +VlaDracul3=actuallyadditions:emeradic_crystal +slbsh=actuallyadditions:empowered_restonia_crystal +WolfgalVlad=actuallyadditions:empowered_diamatine_crystal +Water_Moon=actuallyadditions:phantom_booster +ticticboi=actuallyadditions:empowered_diamatine_crystal +The_Boo=actuallyadditions:empowered_diamatine_crystal +Cloniart47=actuallyadditions:diamatine_crystal +kei_kouma=actuallyadditions:enori_crystal +kingofaces2=actuallyadditions:emeradic_crystal +Sharkbite202020=actuallyadditions:empowered_emeradic_crystal +ArcticPrince=actuallyadditions:phantom_itemface \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/ThreadSpecialFetcher.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/ThreadSpecialFetcher.java index 4f50bf3e1..dad643550 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/ThreadSpecialFetcher.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/ThreadSpecialFetcher.java @@ -28,8 +28,7 @@ public class ThreadSpecialFetcher extends Thread { public void run() { ActuallyAdditions.LOGGER.info("Fetching Special People Stuff..."); try { - //URL url = new URL("https://raw.githubusercontent.com/Ellpeck/ActuallyAdditions/main/specialPeopleStuff.properties"); - URL url = new URL("https://raw.githubusercontent.com/Ellpeck/ActuallyAdditions/1.20.4/specialPeopleStuff.properties"); + URL url = new URL("https://raw.githubusercontent.com/Ellpeck/ActuallyAdditions/main/specialPeopleThings.properties"); Properties specialProperties = new Properties(); specialProperties.load(new InputStreamReader(url.openStream())); SpecialRenderInit.parse(specialProperties);