From a1a1265d24d2ceedab0ba83cf08cd1ec030bd415 Mon Sep 17 00:00:00 2001 From: thepigcat Date: Fri, 11 Oct 2024 18:09:36 +0200 Subject: [PATCH] folder renaming && textures --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- .../com/leclowndu93150/carbort/Carbort.java | 2 +- .../blockEntities/SmileyCloudBlockEntity.java | 4 ++-- .../blocks/BeanCropBlock.java | 4 ++-- .../{common => content}/blocks/CakeBlock.java | 4 +--- .../blocks/PlaceableFoodBlock.java | 2 +- .../effects/SlippyHands.java | 3 +-- .../effects/SoulTorment.java | 5 ++--- .../energy/IEnergyItem.java | 2 +- .../energy/ItemStackEnergyStorage.java | 4 ++-- .../{common => content}/items/BeanItem.java | 3 +-- .../items/ChunkAnalyzerItem.java | 11 +++-------- .../{common => content}/items/EmpItem.java | 2 +- .../items/HealingAxeItem.java | 2 +- .../items/PartyPickaxeItem.java | 5 +---- .../{common => content}/items/ToolTiers.java | 2 +- .../items/UnstableIngotItem.java | 4 ++-- .../screen/ChunkAnalyzerDataPanel.java | 3 +-- .../screen/ChunkAnalyzerMenu.java | 7 +++---- .../screen/ChunkAnalyzerScreen.java | 2 +- .../carbort/events/CarbortEvents.java | 17 +++++------------ .../carbort/networking/PayloadActions.java | 11 +++-------- .../BlockEntityRegistry.java | 4 ++-- .../BlockRegistry.java | 4 ++-- .../CreativeTabRegistry.java | 8 ++------ .../DataComponentRegistry.java | 5 +---- .../EffectRegistry.java | 7 +++---- .../{registry => registries}/FoodRegistry.java | 4 ++-- .../{registry => registries}/ItemRegistry.java | 6 ++---- .../carbort/registries/KeyBindRegistry.java | 4 ++++ .../{registry => registries}/MenuRegistry.java | 4 ++-- .../holder/CakeFlavour.java | 8 ++++---- .../carbort/registry/KeyBindRegistry.java | 4 ---- .../assets/carbort/textures/item/bean_wand.png | Bin 328 -> 375 bytes .../carbort/textures/item/party_pickaxe.png | Bin 283 -> 350 bytes .../carbort/textures/item/shrinkinator.png | Bin 0 -> 334 bytes .../carbort/textures/item/tape_measure.png | Bin 0 -> 204 bytes .../textures/item/tape_measure_extended.png | Bin 0 -> 216 bytes .../carbort/textures/item/tormented_soul.png | Bin 290 -> 346 bytes 40 files changed, 62 insertions(+), 99 deletions(-) rename src/main/java/com/leclowndu93150/carbort/{common => content}/blockEntities/SmileyCloudBlockEntity.java (74%) rename src/main/java/com/leclowndu93150/carbort/{common => content}/blocks/BeanCropBlock.java (92%) rename src/main/java/com/leclowndu93150/carbort/{common => content}/blocks/CakeBlock.java (93%) rename src/main/java/com/leclowndu93150/carbort/{common => content}/blocks/PlaceableFoodBlock.java (99%) rename src/main/java/com/leclowndu93150/carbort/{common => content}/effects/SlippyHands.java (96%) rename src/main/java/com/leclowndu93150/carbort/{common => content}/effects/SoulTorment.java (83%) rename src/main/java/com/leclowndu93150/carbort/{common => content}/energy/IEnergyItem.java (52%) rename src/main/java/com/leclowndu93150/carbort/{common => content}/energy/ItemStackEnergyStorage.java (95%) rename src/main/java/com/leclowndu93150/carbort/{common => content}/items/BeanItem.java (95%) rename src/main/java/com/leclowndu93150/carbort/{common => content}/items/ChunkAnalyzerItem.java (82%) rename src/main/java/com/leclowndu93150/carbort/{common => content}/items/EmpItem.java (81%) rename src/main/java/com/leclowndu93150/carbort/{common => content}/items/HealingAxeItem.java (97%) rename src/main/java/com/leclowndu93150/carbort/{common => content}/items/PartyPickaxeItem.java (94%) rename src/main/java/com/leclowndu93150/carbort/{common => content}/items/ToolTiers.java (89%) rename src/main/java/com/leclowndu93150/carbort/{common => content}/items/UnstableIngotItem.java (96%) rename src/main/java/com/leclowndu93150/carbort/{common => content}/screen/ChunkAnalyzerDataPanel.java (96%) rename src/main/java/com/leclowndu93150/carbort/{common => content}/screen/ChunkAnalyzerMenu.java (80%) rename src/main/java/com/leclowndu93150/carbort/{common => content}/screen/ChunkAnalyzerScreen.java (98%) rename src/main/java/com/leclowndu93150/carbort/{registry => registries}/BlockEntityRegistry.java (84%) rename src/main/java/com/leclowndu93150/carbort/{registry => registries}/BlockRegistry.java (89%) rename src/main/java/com/leclowndu93150/carbort/{registry => registries}/CreativeTabRegistry.java (83%) rename src/main/java/com/leclowndu93150/carbort/{registry => registries}/DataComponentRegistry.java (81%) rename src/main/java/com/leclowndu93150/carbort/{registry => registries}/EffectRegistry.java (86%) rename src/main/java/com/leclowndu93150/carbort/{registry => registries}/FoodRegistry.java (83%) rename src/main/java/com/leclowndu93150/carbort/{registry => registries}/ItemRegistry.java (95%) create mode 100644 src/main/java/com/leclowndu93150/carbort/registries/KeyBindRegistry.java rename src/main/java/com/leclowndu93150/carbort/{registry => registries}/MenuRegistry.java (89%) rename src/main/java/com/leclowndu93150/carbort/{registry => registries}/holder/CakeFlavour.java (82%) delete mode 100644 src/main/java/com/leclowndu93150/carbort/registry/KeyBindRegistry.java create mode 100644 src/main/resources/assets/carbort/textures/item/shrinkinator.png create mode 100644 src/main/resources/assets/carbort/textures/item/tape_measure.png create mode 100644 src/main/resources/assets/carbort/textures/item/tape_measure_extended.png diff --git a/build.gradle b/build.gradle index 4854bf8..3d04b24 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ plugins { id 'eclipse' id 'idea' id 'maven-publish' - id 'net.neoforged.gradle.userdev' version '7.0.153' + id 'net.neoforged.gradle.userdev' version '7.0.165' } tasks.named('wrapper', Wrapper).configure { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b82aa23..a441313 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/java/com/leclowndu93150/carbort/Carbort.java b/src/main/java/com/leclowndu93150/carbort/Carbort.java index 1cfe887..726a61a 100644 --- a/src/main/java/com/leclowndu93150/carbort/Carbort.java +++ b/src/main/java/com/leclowndu93150/carbort/Carbort.java @@ -1,6 +1,6 @@ package com.leclowndu93150.carbort; -import com.leclowndu93150.carbort.registry.*; +import com.leclowndu93150.carbort.registries.*; import com.mojang.logging.LogUtils; import net.neoforged.bus.api.IEventBus; import net.neoforged.fml.ModContainer; diff --git a/src/main/java/com/leclowndu93150/carbort/common/blockEntities/SmileyCloudBlockEntity.java b/src/main/java/com/leclowndu93150/carbort/content/blockEntities/SmileyCloudBlockEntity.java similarity index 74% rename from src/main/java/com/leclowndu93150/carbort/common/blockEntities/SmileyCloudBlockEntity.java rename to src/main/java/com/leclowndu93150/carbort/content/blockEntities/SmileyCloudBlockEntity.java index 6496338..248c1e2 100644 --- a/src/main/java/com/leclowndu93150/carbort/common/blockEntities/SmileyCloudBlockEntity.java +++ b/src/main/java/com/leclowndu93150/carbort/content/blockEntities/SmileyCloudBlockEntity.java @@ -1,6 +1,6 @@ -package com.leclowndu93150.carbort.common.blockEntities; +package com.leclowndu93150.carbort.content.blockEntities; -import com.leclowndu93150.carbort.registry.BlockEntityRegistry; +import com.leclowndu93150.carbort.registries.BlockEntityRegistry; import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; diff --git a/src/main/java/com/leclowndu93150/carbort/common/blocks/BeanCropBlock.java b/src/main/java/com/leclowndu93150/carbort/content/blocks/BeanCropBlock.java similarity index 92% rename from src/main/java/com/leclowndu93150/carbort/common/blocks/BeanCropBlock.java rename to src/main/java/com/leclowndu93150/carbort/content/blocks/BeanCropBlock.java index 38ea44a..dadf02e 100644 --- a/src/main/java/com/leclowndu93150/carbort/common/blocks/BeanCropBlock.java +++ b/src/main/java/com/leclowndu93150/carbort/content/blocks/BeanCropBlock.java @@ -1,6 +1,6 @@ -package com.leclowndu93150.carbort.common.blocks; +package com.leclowndu93150.carbort.content.blocks; -import com.leclowndu93150.carbort.registry.ItemRegistry; +import com.leclowndu93150.carbort.registries.ItemRegistry; import net.minecraft.core.BlockPos; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.ItemLike; diff --git a/src/main/java/com/leclowndu93150/carbort/common/blocks/CakeBlock.java b/src/main/java/com/leclowndu93150/carbort/content/blocks/CakeBlock.java similarity index 93% rename from src/main/java/com/leclowndu93150/carbort/common/blocks/CakeBlock.java rename to src/main/java/com/leclowndu93150/carbort/content/blocks/CakeBlock.java index 500d31a..e36a06c 100644 --- a/src/main/java/com/leclowndu93150/carbort/common/blocks/CakeBlock.java +++ b/src/main/java/com/leclowndu93150/carbort/content/blocks/CakeBlock.java @@ -1,8 +1,6 @@ -package com.leclowndu93150.carbort.common.blocks; +package com.leclowndu93150.carbort.content.blocks; -import com.leclowndu93150.carbort.Carbort; import net.minecraft.core.BlockPos; -import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; diff --git a/src/main/java/com/leclowndu93150/carbort/common/blocks/PlaceableFoodBlock.java b/src/main/java/com/leclowndu93150/carbort/content/blocks/PlaceableFoodBlock.java similarity index 99% rename from src/main/java/com/leclowndu93150/carbort/common/blocks/PlaceableFoodBlock.java rename to src/main/java/com/leclowndu93150/carbort/content/blocks/PlaceableFoodBlock.java index e4d13a9..b7de811 100644 --- a/src/main/java/com/leclowndu93150/carbort/common/blocks/PlaceableFoodBlock.java +++ b/src/main/java/com/leclowndu93150/carbort/content/blocks/PlaceableFoodBlock.java @@ -1,4 +1,4 @@ -package com.leclowndu93150.carbort.common.blocks; +package com.leclowndu93150.carbort.content.blocks; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; diff --git a/src/main/java/com/leclowndu93150/carbort/common/effects/SlippyHands.java b/src/main/java/com/leclowndu93150/carbort/content/effects/SlippyHands.java similarity index 96% rename from src/main/java/com/leclowndu93150/carbort/common/effects/SlippyHands.java rename to src/main/java/com/leclowndu93150/carbort/content/effects/SlippyHands.java index bf917b3..9eb7178 100644 --- a/src/main/java/com/leclowndu93150/carbort/common/effects/SlippyHands.java +++ b/src/main/java/com/leclowndu93150/carbort/content/effects/SlippyHands.java @@ -1,6 +1,5 @@ -package com.leclowndu93150.carbort.common.effects; +package com.leclowndu93150.carbort.content.effects; -import com.leclowndu93150.carbort.Carbort; import net.minecraft.world.effect.MobEffect; import net.minecraft.world.effect.MobEffectCategory; import net.minecraft.world.entity.LivingEntity; diff --git a/src/main/java/com/leclowndu93150/carbort/common/effects/SoulTorment.java b/src/main/java/com/leclowndu93150/carbort/content/effects/SoulTorment.java similarity index 83% rename from src/main/java/com/leclowndu93150/carbort/common/effects/SoulTorment.java rename to src/main/java/com/leclowndu93150/carbort/content/effects/SoulTorment.java index a9011ee..d9b4602 100644 --- a/src/main/java/com/leclowndu93150/carbort/common/effects/SoulTorment.java +++ b/src/main/java/com/leclowndu93150/carbort/content/effects/SoulTorment.java @@ -1,12 +1,11 @@ -package com.leclowndu93150.carbort.common.effects; +package com.leclowndu93150.carbort.content.effects; -import com.leclowndu93150.carbort.registry.ItemRegistry; +import com.leclowndu93150.carbort.registries.ItemRegistry; import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.effect.MobEffect; import net.minecraft.world.effect.MobEffectCategory; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; public class SoulTorment extends MobEffect { public SoulTorment(MobEffectCategory type, int col){ diff --git a/src/main/java/com/leclowndu93150/carbort/common/energy/IEnergyItem.java b/src/main/java/com/leclowndu93150/carbort/content/energy/IEnergyItem.java similarity index 52% rename from src/main/java/com/leclowndu93150/carbort/common/energy/IEnergyItem.java rename to src/main/java/com/leclowndu93150/carbort/content/energy/IEnergyItem.java index aeae06a..0478f41 100644 --- a/src/main/java/com/leclowndu93150/carbort/common/energy/IEnergyItem.java +++ b/src/main/java/com/leclowndu93150/carbort/content/energy/IEnergyItem.java @@ -1,4 +1,4 @@ -package com.leclowndu93150.carbort.common.energy; +package com.leclowndu93150.carbort.content.energy; public interface IEnergyItem { int getCapacity(); diff --git a/src/main/java/com/leclowndu93150/carbort/common/energy/ItemStackEnergyStorage.java b/src/main/java/com/leclowndu93150/carbort/content/energy/ItemStackEnergyStorage.java similarity index 95% rename from src/main/java/com/leclowndu93150/carbort/common/energy/ItemStackEnergyStorage.java rename to src/main/java/com/leclowndu93150/carbort/content/energy/ItemStackEnergyStorage.java index 18b245d..96f74c0 100644 --- a/src/main/java/com/leclowndu93150/carbort/common/energy/ItemStackEnergyStorage.java +++ b/src/main/java/com/leclowndu93150/carbort/content/energy/ItemStackEnergyStorage.java @@ -1,6 +1,6 @@ -package com.leclowndu93150.carbort.common.energy; +package com.leclowndu93150.carbort.content.energy; -import com.leclowndu93150.carbort.registry.DataComponentRegistry; +import com.leclowndu93150.carbort.registries.DataComponentRegistry; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.IntTag; import net.minecraft.nbt.Tag; diff --git a/src/main/java/com/leclowndu93150/carbort/common/items/BeanItem.java b/src/main/java/com/leclowndu93150/carbort/content/items/BeanItem.java similarity index 95% rename from src/main/java/com/leclowndu93150/carbort/common/items/BeanItem.java rename to src/main/java/com/leclowndu93150/carbort/content/items/BeanItem.java index c68a8ca..24e2e10 100644 --- a/src/main/java/com/leclowndu93150/carbort/common/items/BeanItem.java +++ b/src/main/java/com/leclowndu93150/carbort/content/items/BeanItem.java @@ -1,10 +1,9 @@ -package com.leclowndu93150.carbort.common.items; +package com.leclowndu93150.carbort.content.items; import net.minecraft.core.BlockPos; import net.minecraft.util.RandomSource; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemNameBlockItem; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Explosion; diff --git a/src/main/java/com/leclowndu93150/carbort/common/items/ChunkAnalyzerItem.java b/src/main/java/com/leclowndu93150/carbort/content/items/ChunkAnalyzerItem.java similarity index 82% rename from src/main/java/com/leclowndu93150/carbort/common/items/ChunkAnalyzerItem.java rename to src/main/java/com/leclowndu93150/carbort/content/items/ChunkAnalyzerItem.java index 8503484..56a0425 100644 --- a/src/main/java/com/leclowndu93150/carbort/common/items/ChunkAnalyzerItem.java +++ b/src/main/java/com/leclowndu93150/carbort/content/items/ChunkAnalyzerItem.java @@ -1,12 +1,9 @@ -package com.leclowndu93150.carbort.common.items; +package com.leclowndu93150.carbort.content.items; import com.leclowndu93150.carbort.CarbortConfig; -import com.leclowndu93150.carbort.common.energy.IEnergyItem; -import com.leclowndu93150.carbort.common.screen.ChunkAnalyzerMenu; -import com.leclowndu93150.carbort.common.screen.ChunkAnalyzerScreen; -import com.leclowndu93150.carbort.registry.DataComponentRegistry; +import com.leclowndu93150.carbort.content.energy.IEnergyItem; +import com.leclowndu93150.carbort.content.screen.ChunkAnalyzerMenu; import com.leclowndu93150.carbort.utils.CapabilityUtils; -import net.minecraft.client.Minecraft; import net.minecraft.network.chat.Component; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResultHolder; @@ -14,10 +11,8 @@ import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.AbstractContainerMenu; -import net.minecraft.world.inventory.SimpleContainerData; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Rarity; import net.minecraft.world.level.Level; import net.neoforged.neoforge.energy.IEnergyStorage; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/leclowndu93150/carbort/common/items/EmpItem.java b/src/main/java/com/leclowndu93150/carbort/content/items/EmpItem.java similarity index 81% rename from src/main/java/com/leclowndu93150/carbort/common/items/EmpItem.java rename to src/main/java/com/leclowndu93150/carbort/content/items/EmpItem.java index 6b55038..1bd3384 100644 --- a/src/main/java/com/leclowndu93150/carbort/common/items/EmpItem.java +++ b/src/main/java/com/leclowndu93150/carbort/content/items/EmpItem.java @@ -1,4 +1,4 @@ -package com.leclowndu93150.carbort.common.items; +package com.leclowndu93150.carbort.content.items; import net.minecraft.world.item.Item; import net.minecraft.world.item.SplashPotionItem; diff --git a/src/main/java/com/leclowndu93150/carbort/common/items/HealingAxeItem.java b/src/main/java/com/leclowndu93150/carbort/content/items/HealingAxeItem.java similarity index 97% rename from src/main/java/com/leclowndu93150/carbort/common/items/HealingAxeItem.java rename to src/main/java/com/leclowndu93150/carbort/content/items/HealingAxeItem.java index 68fea8a..4e061c4 100644 --- a/src/main/java/com/leclowndu93150/carbort/common/items/HealingAxeItem.java +++ b/src/main/java/com/leclowndu93150/carbort/content/items/HealingAxeItem.java @@ -1,4 +1,4 @@ -package com.leclowndu93150.carbort.common.items; +package com.leclowndu93150.carbort.content.items; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerPlayer; diff --git a/src/main/java/com/leclowndu93150/carbort/common/items/PartyPickaxeItem.java b/src/main/java/com/leclowndu93150/carbort/content/items/PartyPickaxeItem.java similarity index 94% rename from src/main/java/com/leclowndu93150/carbort/common/items/PartyPickaxeItem.java rename to src/main/java/com/leclowndu93150/carbort/content/items/PartyPickaxeItem.java index ac68ed4..387f3c1 100644 --- a/src/main/java/com/leclowndu93150/carbort/common/items/PartyPickaxeItem.java +++ b/src/main/java/com/leclowndu93150/carbort/content/items/PartyPickaxeItem.java @@ -1,7 +1,6 @@ -package com.leclowndu93150.carbort.common.items; +package com.leclowndu93150.carbort.content.items; import net.minecraft.ChatFormatting; -import net.minecraft.client.Minecraft; import net.minecraft.core.Direction; import net.minecraft.network.chat.Component; import net.minecraft.world.InteractionResult; @@ -9,14 +8,12 @@ import net.minecraft.world.entity.projectile.FireworkRocketEntity; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.PickaxeItem; -import net.minecraft.world.item.Tiers; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.state.BlockState; import org.jetbrains.annotations.NotNull; -import javax.annotation.Nonnull; import java.util.List; public class PartyPickaxeItem extends PickaxeItem { diff --git a/src/main/java/com/leclowndu93150/carbort/common/items/ToolTiers.java b/src/main/java/com/leclowndu93150/carbort/content/items/ToolTiers.java similarity index 89% rename from src/main/java/com/leclowndu93150/carbort/common/items/ToolTiers.java rename to src/main/java/com/leclowndu93150/carbort/content/items/ToolTiers.java index 66d573e..e83ff25 100644 --- a/src/main/java/com/leclowndu93150/carbort/common/items/ToolTiers.java +++ b/src/main/java/com/leclowndu93150/carbort/content/items/ToolTiers.java @@ -1,4 +1,4 @@ -package com.leclowndu93150.carbort.common.items; +package com.leclowndu93150.carbort.content.items; import net.minecraft.world.item.Tier; import net.minecraft.world.item.crafting.Ingredient; diff --git a/src/main/java/com/leclowndu93150/carbort/common/items/UnstableIngotItem.java b/src/main/java/com/leclowndu93150/carbort/content/items/UnstableIngotItem.java similarity index 96% rename from src/main/java/com/leclowndu93150/carbort/common/items/UnstableIngotItem.java rename to src/main/java/com/leclowndu93150/carbort/content/items/UnstableIngotItem.java index 54fe1a9..e2d4a7f 100644 --- a/src/main/java/com/leclowndu93150/carbort/common/items/UnstableIngotItem.java +++ b/src/main/java/com/leclowndu93150/carbort/content/items/UnstableIngotItem.java @@ -1,7 +1,7 @@ -package com.leclowndu93150.carbort.common.items; +package com.leclowndu93150.carbort.content.items; import com.google.common.collect.Sets; -import com.leclowndu93150.carbort.registry.DataComponentRegistry; +import com.leclowndu93150.carbort.registries.DataComponentRegistry; import com.leclowndu93150.carbort.utils.RandomFunctions; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/leclowndu93150/carbort/common/screen/ChunkAnalyzerDataPanel.java b/src/main/java/com/leclowndu93150/carbort/content/screen/ChunkAnalyzerDataPanel.java similarity index 96% rename from src/main/java/com/leclowndu93150/carbort/common/screen/ChunkAnalyzerDataPanel.java rename to src/main/java/com/leclowndu93150/carbort/content/screen/ChunkAnalyzerDataPanel.java index 212261a..9dcf94e 100644 --- a/src/main/java/com/leclowndu93150/carbort/common/screen/ChunkAnalyzerDataPanel.java +++ b/src/main/java/com/leclowndu93150/carbort/content/screen/ChunkAnalyzerDataPanel.java @@ -1,7 +1,6 @@ -package com.leclowndu93150.carbort.common.screen; +package com.leclowndu93150.carbort.content.screen; import com.mojang.blaze3d.vertex.Tesselator; -import it.unimi.dsi.fastutil.objects.Object2IntMap; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; diff --git a/src/main/java/com/leclowndu93150/carbort/common/screen/ChunkAnalyzerMenu.java b/src/main/java/com/leclowndu93150/carbort/content/screen/ChunkAnalyzerMenu.java similarity index 80% rename from src/main/java/com/leclowndu93150/carbort/common/screen/ChunkAnalyzerMenu.java rename to src/main/java/com/leclowndu93150/carbort/content/screen/ChunkAnalyzerMenu.java index f2246c9..d14ece8 100644 --- a/src/main/java/com/leclowndu93150/carbort/common/screen/ChunkAnalyzerMenu.java +++ b/src/main/java/com/leclowndu93150/carbort/content/screen/ChunkAnalyzerMenu.java @@ -1,8 +1,7 @@ -package com.leclowndu93150.carbort.common.screen; +package com.leclowndu93150.carbort.content.screen; -import com.leclowndu93150.carbort.common.items.ChunkAnalyzerItem; -import com.leclowndu93150.carbort.registry.MenuRegistry; -import com.leclowndu93150.carbort.utils.ChunkAnalyzerHelper; +import com.leclowndu93150.carbort.content.items.ChunkAnalyzerItem; +import com.leclowndu93150.carbort.registries.MenuRegistry; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; diff --git a/src/main/java/com/leclowndu93150/carbort/common/screen/ChunkAnalyzerScreen.java b/src/main/java/com/leclowndu93150/carbort/content/screen/ChunkAnalyzerScreen.java similarity index 98% rename from src/main/java/com/leclowndu93150/carbort/common/screen/ChunkAnalyzerScreen.java rename to src/main/java/com/leclowndu93150/carbort/content/screen/ChunkAnalyzerScreen.java index 5235745..bfaa20b 100644 --- a/src/main/java/com/leclowndu93150/carbort/common/screen/ChunkAnalyzerScreen.java +++ b/src/main/java/com/leclowndu93150/carbort/content/screen/ChunkAnalyzerScreen.java @@ -1,4 +1,4 @@ -package com.leclowndu93150.carbort.common.screen; +package com.leclowndu93150.carbort.content.screen; import com.leclowndu93150.carbort.Carbort; import com.leclowndu93150.carbort.networking.ChunkAnalyzerTogglePayload; diff --git a/src/main/java/com/leclowndu93150/carbort/events/CarbortEvents.java b/src/main/java/com/leclowndu93150/carbort/events/CarbortEvents.java index a6bff61..39351df 100644 --- a/src/main/java/com/leclowndu93150/carbort/events/CarbortEvents.java +++ b/src/main/java/com/leclowndu93150/carbort/events/CarbortEvents.java @@ -1,25 +1,19 @@ package com.leclowndu93150.carbort.events; import com.leclowndu93150.carbort.Carbort; -import com.leclowndu93150.carbort.common.energy.ItemStackEnergyStorage; -import com.leclowndu93150.carbort.common.items.HealingAxeItem; -import com.leclowndu93150.carbort.common.energy.IEnergyItem; -import com.leclowndu93150.carbort.common.items.UnstableIngotItem; -import com.leclowndu93150.carbort.common.screen.ChunkAnalyzerScreen; +import com.leclowndu93150.carbort.content.energy.ItemStackEnergyStorage; +import com.leclowndu93150.carbort.content.items.HealingAxeItem; +import com.leclowndu93150.carbort.content.energy.IEnergyItem; +import com.leclowndu93150.carbort.content.screen.ChunkAnalyzerScreen; import com.leclowndu93150.carbort.networking.ChunkAnalyzerDataPayload; import com.leclowndu93150.carbort.networking.ChunkAnalyzerTogglePayload; import com.leclowndu93150.carbort.networking.PayloadActions; -import com.leclowndu93150.carbort.registry.DataComponentRegistry; -import com.leclowndu93150.carbort.registry.ItemRegistry; -import com.leclowndu93150.carbort.registry.MenuRegistry; -import net.minecraft.core.component.DataComponentType; +import com.leclowndu93150.carbort.registries.MenuRegistry; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.monster.Monster; -import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; import net.neoforged.bus.api.EventPriority; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.EventBusSubscriber; @@ -27,7 +21,6 @@ import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent; import net.neoforged.neoforge.client.event.RegisterMenuScreensEvent; import net.neoforged.neoforge.event.entity.player.AttackEntityEvent; -import net.neoforged.neoforge.event.entity.player.PlayerEvent; import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent; import net.neoforged.neoforge.network.registration.PayloadRegistrar; diff --git a/src/main/java/com/leclowndu93150/carbort/networking/PayloadActions.java b/src/main/java/com/leclowndu93150/carbort/networking/PayloadActions.java index 0cc26b1..1190097 100644 --- a/src/main/java/com/leclowndu93150/carbort/networking/PayloadActions.java +++ b/src/main/java/com/leclowndu93150/carbort/networking/PayloadActions.java @@ -1,24 +1,19 @@ package com.leclowndu93150.carbort.networking; -import com.leclowndu93150.carbort.Carbort; import com.leclowndu93150.carbort.CarbortConfig; -import com.leclowndu93150.carbort.common.items.ChunkAnalyzerItem; -import com.leclowndu93150.carbort.common.screen.ChunkAnalyzerMenu; -import com.leclowndu93150.carbort.common.screen.ChunkAnalyzerScreen; -import com.leclowndu93150.carbort.registry.DataComponentRegistry; +import com.leclowndu93150.carbort.content.items.ChunkAnalyzerItem; +import com.leclowndu93150.carbort.content.screen.ChunkAnalyzerMenu; +import com.leclowndu93150.carbort.content.screen.ChunkAnalyzerScreen; import com.leclowndu93150.carbort.utils.CapabilityUtils; import com.leclowndu93150.carbort.utils.ChunkAnalyzerHelper; import it.unimi.dsi.fastutil.objects.Object2IntMap; -import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.Screen; import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.resources.ResourceLocation; import net.minecraft.server.TickTask; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; import net.minecraft.world.level.block.Block; import net.neoforged.neoforge.energy.IEnergyStorage; import net.neoforged.neoforge.network.PacketDistributor; diff --git a/src/main/java/com/leclowndu93150/carbort/registry/BlockEntityRegistry.java b/src/main/java/com/leclowndu93150/carbort/registries/BlockEntityRegistry.java similarity index 84% rename from src/main/java/com/leclowndu93150/carbort/registry/BlockEntityRegistry.java rename to src/main/java/com/leclowndu93150/carbort/registries/BlockEntityRegistry.java index 5da43b1..f1b231b 100644 --- a/src/main/java/com/leclowndu93150/carbort/registry/BlockEntityRegistry.java +++ b/src/main/java/com/leclowndu93150/carbort/registries/BlockEntityRegistry.java @@ -1,7 +1,7 @@ -package com.leclowndu93150.carbort.registry; +package com.leclowndu93150.carbort.registries; import com.leclowndu93150.carbort.Carbort; -import com.leclowndu93150.carbort.common.blockEntities.SmileyCloudBlockEntity; +import com.leclowndu93150.carbort.content.blockEntities.SmileyCloudBlockEntity; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.world.level.block.entity.BlockEntityType; import net.neoforged.neoforge.registries.DeferredRegister; diff --git a/src/main/java/com/leclowndu93150/carbort/registry/BlockRegistry.java b/src/main/java/com/leclowndu93150/carbort/registries/BlockRegistry.java similarity index 89% rename from src/main/java/com/leclowndu93150/carbort/registry/BlockRegistry.java rename to src/main/java/com/leclowndu93150/carbort/registries/BlockRegistry.java index 631e33c..74294e4 100644 --- a/src/main/java/com/leclowndu93150/carbort/registry/BlockRegistry.java +++ b/src/main/java/com/leclowndu93150/carbort/registries/BlockRegistry.java @@ -1,7 +1,7 @@ -package com.leclowndu93150.carbort.registry; +package com.leclowndu93150.carbort.registries; import com.leclowndu93150.carbort.Carbort; -import com.leclowndu93150.carbort.common.blocks.BeanCropBlock; +import com.leclowndu93150.carbort.content.blocks.BeanCropBlock; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.SoundType; diff --git a/src/main/java/com/leclowndu93150/carbort/registry/CreativeTabRegistry.java b/src/main/java/com/leclowndu93150/carbort/registries/CreativeTabRegistry.java similarity index 83% rename from src/main/java/com/leclowndu93150/carbort/registry/CreativeTabRegistry.java rename to src/main/java/com/leclowndu93150/carbort/registries/CreativeTabRegistry.java index c815495..4d4fcab 100644 --- a/src/main/java/com/leclowndu93150/carbort/registry/CreativeTabRegistry.java +++ b/src/main/java/com/leclowndu93150/carbort/registries/CreativeTabRegistry.java @@ -1,8 +1,7 @@ -package com.leclowndu93150.carbort.registry; +package com.leclowndu93150.carbort.registries; import com.leclowndu93150.carbort.Carbort; import com.leclowndu93150.carbort.CarbortConfig; -import com.leclowndu93150.carbort.common.items.ChunkAnalyzerItem; import com.leclowndu93150.carbort.utils.CapabilityUtils; import net.minecraft.core.registries.Registries; import net.minecraft.network.chat.Component; @@ -10,14 +9,11 @@ import net.minecraft.world.item.CreativeModeTabs; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.block.Block; import net.neoforged.neoforge.energy.IEnergyStorage; import net.neoforged.neoforge.registries.DeferredHolder; -import net.neoforged.neoforge.registries.DeferredItem; import net.neoforged.neoforge.registries.DeferredRegister; -import static com.leclowndu93150.carbort.registry.BlockRegistry.BLOCKS; -import static com.leclowndu93150.carbort.registry.ItemRegistry.*; +import static com.leclowndu93150.carbort.registries.ItemRegistry.*; public class CreativeTabRegistry { public static final DeferredRegister CREATIVE_MODE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, Carbort.MODID); diff --git a/src/main/java/com/leclowndu93150/carbort/registry/DataComponentRegistry.java b/src/main/java/com/leclowndu93150/carbort/registries/DataComponentRegistry.java similarity index 81% rename from src/main/java/com/leclowndu93150/carbort/registry/DataComponentRegistry.java rename to src/main/java/com/leclowndu93150/carbort/registries/DataComponentRegistry.java index 9b63e1f..f432d2d 100644 --- a/src/main/java/com/leclowndu93150/carbort/registry/DataComponentRegistry.java +++ b/src/main/java/com/leclowndu93150/carbort/registries/DataComponentRegistry.java @@ -1,12 +1,9 @@ -package com.leclowndu93150.carbort.registry; +package com.leclowndu93150.carbort.registries; import com.leclowndu93150.carbort.Carbort; import com.mojang.serialization.Codec; -import com.mojang.serialization.MapCodec; -import com.mojang.serialization.codecs.RecordCodecBuilder; import net.minecraft.core.component.DataComponentType; import net.minecraft.network.codec.ByteBufCodecs; -import net.neoforged.neoforge.energy.ComponentEnergyStorage; import net.neoforged.neoforge.registries.DeferredRegister; import java.util.function.Supplier; diff --git a/src/main/java/com/leclowndu93150/carbort/registry/EffectRegistry.java b/src/main/java/com/leclowndu93150/carbort/registries/EffectRegistry.java similarity index 86% rename from src/main/java/com/leclowndu93150/carbort/registry/EffectRegistry.java rename to src/main/java/com/leclowndu93150/carbort/registries/EffectRegistry.java index eda526b..3091a57 100644 --- a/src/main/java/com/leclowndu93150/carbort/registry/EffectRegistry.java +++ b/src/main/java/com/leclowndu93150/carbort/registries/EffectRegistry.java @@ -1,8 +1,8 @@ -package com.leclowndu93150.carbort.registry; +package com.leclowndu93150.carbort.registries; import com.leclowndu93150.carbort.Carbort; -import com.leclowndu93150.carbort.common.effects.SlippyHands; -import com.leclowndu93150.carbort.common.effects.SoulTorment; +import com.leclowndu93150.carbort.content.effects.SlippyHands; +import com.leclowndu93150.carbort.content.effects.SoulTorment; import net.minecraft.core.registries.Registries; import net.minecraft.world.effect.MobEffect; import net.minecraft.world.effect.MobEffectCategory; @@ -10,7 +10,6 @@ import net.minecraft.world.item.alchemy.Potion; import net.neoforged.neoforge.registries.DeferredHolder; import net.neoforged.neoforge.registries.DeferredRegister; -import net.neoforged.neoforge.registries.NeoForgeRegistries; public class EffectRegistry { public static final DeferredRegister EFFECTS = DeferredRegister.create(Registries.MOB_EFFECT, Carbort.MODID); diff --git a/src/main/java/com/leclowndu93150/carbort/registry/FoodRegistry.java b/src/main/java/com/leclowndu93150/carbort/registries/FoodRegistry.java similarity index 83% rename from src/main/java/com/leclowndu93150/carbort/registry/FoodRegistry.java rename to src/main/java/com/leclowndu93150/carbort/registries/FoodRegistry.java index 3d15a55..a57abee 100644 --- a/src/main/java/com/leclowndu93150/carbort/registry/FoodRegistry.java +++ b/src/main/java/com/leclowndu93150/carbort/registries/FoodRegistry.java @@ -1,6 +1,6 @@ -package com.leclowndu93150.carbort.registry; +package com.leclowndu93150.carbort.registries; -import com.leclowndu93150.carbort.registry.holder.CakeFlavour; +import com.leclowndu93150.carbort.registries.holder.CakeFlavour; public class FoodRegistry { public FoodRegistry(){ diff --git a/src/main/java/com/leclowndu93150/carbort/registry/ItemRegistry.java b/src/main/java/com/leclowndu93150/carbort/registries/ItemRegistry.java similarity index 95% rename from src/main/java/com/leclowndu93150/carbort/registry/ItemRegistry.java rename to src/main/java/com/leclowndu93150/carbort/registries/ItemRegistry.java index f1a2570..c80bd5b 100644 --- a/src/main/java/com/leclowndu93150/carbort/registry/ItemRegistry.java +++ b/src/main/java/com/leclowndu93150/carbort/registries/ItemRegistry.java @@ -1,7 +1,7 @@ -package com.leclowndu93150.carbort.registry; +package com.leclowndu93150.carbort.registries; import com.leclowndu93150.carbort.Carbort; -import com.leclowndu93150.carbort.common.items.*; +import com.leclowndu93150.carbort.content.items.*; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.food.FoodProperties; @@ -11,8 +11,6 @@ import net.neoforged.neoforge.registries.DeferredItem; import net.neoforged.neoforge.registries.DeferredRegister; -import java.util.Collections; - public class ItemRegistry { public static final DeferredRegister.Items ITEMS = DeferredRegister.createItems(Carbort.MODID); diff --git a/src/main/java/com/leclowndu93150/carbort/registries/KeyBindRegistry.java b/src/main/java/com/leclowndu93150/carbort/registries/KeyBindRegistry.java new file mode 100644 index 0000000..d82ba49 --- /dev/null +++ b/src/main/java/com/leclowndu93150/carbort/registries/KeyBindRegistry.java @@ -0,0 +1,4 @@ +package com.leclowndu93150.carbort.registries; + +public class KeyBindRegistry { +} diff --git a/src/main/java/com/leclowndu93150/carbort/registry/MenuRegistry.java b/src/main/java/com/leclowndu93150/carbort/registries/MenuRegistry.java similarity index 89% rename from src/main/java/com/leclowndu93150/carbort/registry/MenuRegistry.java rename to src/main/java/com/leclowndu93150/carbort/registries/MenuRegistry.java index f4afc27..69298b4 100644 --- a/src/main/java/com/leclowndu93150/carbort/registry/MenuRegistry.java +++ b/src/main/java/com/leclowndu93150/carbort/registries/MenuRegistry.java @@ -1,7 +1,7 @@ -package com.leclowndu93150.carbort.registry; +package com.leclowndu93150.carbort.registries; import com.leclowndu93150.carbort.Carbort; -import com.leclowndu93150.carbort.common.screen.ChunkAnalyzerMenu; +import com.leclowndu93150.carbort.content.screen.ChunkAnalyzerMenu; import net.minecraft.core.registries.Registries; import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.inventory.MenuType; diff --git a/src/main/java/com/leclowndu93150/carbort/registry/holder/CakeFlavour.java b/src/main/java/com/leclowndu93150/carbort/registries/holder/CakeFlavour.java similarity index 82% rename from src/main/java/com/leclowndu93150/carbort/registry/holder/CakeFlavour.java rename to src/main/java/com/leclowndu93150/carbort/registries/holder/CakeFlavour.java index 91c1553..7f4dcb1 100644 --- a/src/main/java/com/leclowndu93150/carbort/registry/holder/CakeFlavour.java +++ b/src/main/java/com/leclowndu93150/carbort/registries/holder/CakeFlavour.java @@ -1,8 +1,8 @@ -package com.leclowndu93150.carbort.registry.holder; +package com.leclowndu93150.carbort.registries.holder; -import com.leclowndu93150.carbort.common.blocks.CakeBlock; -import com.leclowndu93150.carbort.registry.BlockRegistry; -import com.leclowndu93150.carbort.registry.ItemRegistry; +import com.leclowndu93150.carbort.content.blocks.CakeBlock; +import com.leclowndu93150.carbort.registries.BlockRegistry; +import com.leclowndu93150.carbort.registries.ItemRegistry; import net.minecraft.world.food.FoodProperties; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; diff --git a/src/main/java/com/leclowndu93150/carbort/registry/KeyBindRegistry.java b/src/main/java/com/leclowndu93150/carbort/registry/KeyBindRegistry.java deleted file mode 100644 index 8ce655a..0000000 --- a/src/main/java/com/leclowndu93150/carbort/registry/KeyBindRegistry.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.leclowndu93150.carbort.registry; - -public class KeyBindRegistry { -} diff --git a/src/main/resources/assets/carbort/textures/item/bean_wand.png b/src/main/resources/assets/carbort/textures/item/bean_wand.png index b7528f8d8f9663840bf660fc5867c9aec202140d..10c9ed5a81d7d510f3d01105cb4f58812ec9cf95 100644 GIT binary patch delta 335 zcmV-V0kHna0`~%tF@G^hL_t(Ijm46&O9EjS#($R$aS#oiXAtV3LxXV8AfIBo9UL^e zH8nUmHnq02_HQ&dHAIWVwH91pl0%6dYBwor1bt24QE=%^^{n6fd%lO~ec`{Q#TjzS z83}OdzG#h7POj@~0GwSvXe)8xie=Cn&S;c!^3bVLuN4_j=YIgK#*J!cP3pBG!@+>A zKVmqZ0kAXyK+t)ox|0Q<>yK!4`doOg+EN1*e|tm6Or^NJ^JsPYbmt!w@=3YSK*0cy zpW_fN?rl*nY=(0Sx1iduSO(Aj6xR#FH}7er!7nA+woPKvmT6PR^@0#q(04@|BqnWH zu?%kR-xMUHU`UAQz$s^B+SEC}>al-ttO+3^e~vUz#kpQU^XMejmHvQFo4Zo2M+kus hBECT(pA6wY)fekJdQb16X2Jjf002ovPDHLkV1l3=op}HN delta 288 zcmV+*0pI@j0>}c8F@FL{L_t(IjbmUKa-hgr`+usX@_!hgg;dQU_GU2d|JldyG7@b- zk+b%H1_lO(S1(^O+F#;O*pAhONJuDr#mnSp_UfeD)+%w|HG85kHCn9&71t>pg8ig7V) zKkb|l=?VaPS7pId7^f}(0000@U9 z0-;_E+g7Y%xc=q^b{7cn$ov-XUBV%CQGn${V0Tem7^E}N&|I15oVs$n_K%~vM gfrcD6`I;#O00K0AE-n5jCjbBd07*qoM6N<$f}yOMr~m)} literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~j{u(#S0HWt z`n2}(HR_vYb*8Il_{n*iiSpT-X~=PNs47^ihp5Zh3h>CVF>?cT0~I5Kw@+ktZsb0H zTr}qYW1*WpPk?d~B|(0{4F9o%mv>yufNEkrT^vIsrk3^wavd<>aL&Ht7Af;@%Dw+9 zHV4em)u}((y>UvsDXUA0mGVu|CP|C@SzlKqnAsdzzEY_-<{Y2zzcq4m&&!wkY(0{E saz-Uff2!TS=x5526_M{Jzj|iA_kJ2PPt5<1p&*BPy85}Sb4q9e0F?`A`Tzg` diff --git a/src/main/resources/assets/carbort/textures/item/shrinkinator.png b/src/main/resources/assets/carbort/textures/item/shrinkinator.png new file mode 100644 index 0000000000000000000000000000000000000000..6c3ea1bbed5b3ac7de2a8227eaa78386c282b35f GIT binary patch literal 334 zcmV-U0kQsxP)Px$2uVaiR5*>blCf>WFc3vw0xzIO0Z70Tuu!2apwe7H3k2y^tJVlsktyUZJFw6S zWWnZuAidH=f+fmM<6L*g`;VW*hyN^V?PRT;9s;^`_Ou<;bv=m)S(Yucxfc z2w@Q@r3fLQlu7`}A2{b0@hou8Es(noW~C6W9)z z)SpUWNREzofS*NTzT&GCOo7)Uju>BuRzA(iz=zqf_r!zJVl^B6o`{an^LB{Ts5 Dub@jC literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/carbort/textures/item/tape_measure_extended.png b/src/main/resources/assets/carbort/textures/item/tape_measure_extended.png new file mode 100644 index 0000000000000000000000000000000000000000..878430085f25b8d787d0fc55384285bc6f6cd00a GIT binary patch literal 216 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`^F3W0Ln`8u6C{KV+`s?doC6W9)z z)SpUWNREzofS*NTzT&GCOo7)Uju>BuP2-(ga0=`onYj z!i_zYIqGldeEfgdhjRzpB-18?T~ccvlrC3t5}x7~?kv#2tLXlC0Rw}fbP0l+XkK0`^Ty literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/carbort/textures/item/tormented_soul.png b/src/main/resources/assets/carbort/textures/item/tormented_soul.png index be45a90f85a334d44c5f986dc116a8fccf4b6844..7501db6b9c265022f431f6294da7b2bda30fee15 100644 GIT binary patch delta 307 zcmV-30nGlQ0@?zQFn<9QNkl|Gt3&BeGBG)@iWL6ee-4i0gOQ1bG+=pEmE=iGD7z3|@^Msa29@9zSa zMQ$C?N)SeIb$Wbc1zQQqBIowxkc)Gl@nqU+!)gKG$fv9Lm%2)|%b~h<>%H5rLGxHYy4b!p{)qOFGe7|0l1Ed0`WhcW< zOG#D=ye9X$ZH(DM8bcW&4+^5gZ~Ol3!D_u_KAoiAmsDi`_H)Q|kc#li{!R{~SlWfO zgL8SZ;Oz1fD~stPw_Ww!pjnz;iw#