-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3 from QuantumXenon/1.19.x
Thanks for updating this to 1.19!
- Loading branch information
Showing
26 changed files
with
132 additions
and
571 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| # eclipse | ||
| bin | ||
| *.launch | ||
| .settings | ||
| .metadata | ||
| .classpath | ||
| .project | ||
|
|
||
| # idea | ||
| out | ||
| *.ipr | ||
| *.iws | ||
| *.iml | ||
| .idea | ||
|
|
||
| # gradle | ||
| build | ||
| .gradle | ||
|
|
||
| # other | ||
| eclipse | ||
| run | ||
|
|
||
| *.un~ | ||
| libs |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,16 @@ | ||
| org.gradle.jvmargs=-Xmx4G | ||
|
|
||
| # Fabric Properties | ||
| minecraft_version=1.18.1 | ||
| yarn_mappings=1.18+build.1 | ||
| loader_version=0.12.12 | ||
| minecraft_version=1.19 | ||
| yarn_mappings=1.19+build.4 | ||
| loader_version=0.14.9 | ||
|
|
||
| # Mod Properties | ||
| mod_version=1.18.1-0.1.1 | ||
| mod_version=1.19-0.3.0 | ||
| maven_group=com.github.latokike | ||
| archives_base_name=SpilaioOrigins | ||
|
|
||
| # Dependencies | ||
| fabric_version=0.43.1+1.18 | ||
| origins_version=1.3.1 | ||
| pehkui_version=3.0.0 | ||
| fabric_version=0.58.0+1.19 | ||
| origins_version=1.6.2 | ||
| pehkui_version=3.4.0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,5 @@ | ||
| pluginManagement { | ||
| repositories { | ||
| jcenter() | ||
| maven { | ||
| name = 'Fabric' | ||
| url = 'https://maven.fabricmc.net/' | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 2 additions & 20 deletions
22
src/main/java/com/github/latokike/mixin/PlayerEntityMixin.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
74 changes: 37 additions & 37 deletions
74
src/main/java/com/github/latokike/registry/ModScaleTypes.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,45 +1,45 @@ | ||
| package com.github.latokike.registry; | ||
|
|
||
| /* | ||
| import com.github.latokike.SpilaioOrigins; | ||
| //import net.minecraft.entity.Entity; | ||
| //import net.minecraft.util.Identifier; | ||
| //import virtuoel.pehkui.api.*; | ||
|
|
||
| import net.minecraft.entity.Entity; | ||
| import net.minecraft.util.Identifier; | ||
| import virtuoel.pehkui.api.*; | ||
| import java.util.Map; | ||
| */ | ||
|
|
||
| public class ModScaleTypes { | ||
| // private static final ScaleType[] MODIFY_SIZE_TYPES = {ScaleTypes.WIDTH, ScaleTypes.HEIGHT, ScaleTypes.DROPS}; | ||
|
|
||
| // public static final ScaleType MODIFY_SIZE_TYPE = register(ScaleRegistries.SCALE_TYPES, "modify_size", ScaleType.Builder.create().build()); | ||
|
|
||
| // public static final ScaleModifier MODIFY_SIZE_MODIFIER = register(ScaleRegistries.SCALE_MODIFIERS, "modify_size", new ScaleModifier() { | ||
| // @Override | ||
| // public float modifyScale(final ScaleData scaleData, float modifiedScale, final float delta) { | ||
| // return MODIFY_SIZE_TYPE.getScaleData(scaleData.getEntity()).getScale(delta) * modifiedScale; | ||
| // } | ||
| // }); | ||
|
|
||
| // private static <T> T register(Map<Identifier, T> registry, String name, T entry) { | ||
| // return ScaleRegistries.register(registry, new Identifier(SpilaioOrigins.MODID, name), entry); | ||
| // } | ||
| /* | ||
| private static final ScaleType[] MODIFY_SIZE_TYPES = {ScaleTypes.WIDTH, ScaleTypes.HEIGHT, ScaleTypes.DROPS}; | ||
| public static final ScaleType MODIFY_SIZE_TYPE = register(ScaleRegistries.SCALE_TYPES, "modify_size", ScaleType.Builder.create().build()); | ||
| public static final ScaleModifier MODIFY_SIZE_MODIFIER = register(ScaleRegistries.SCALE_MODIFIERS, "modify_size", new ScaleModifier() { | ||
| @Override | ||
| public float modifyScale(final ScaleData scaleData, float modifiedScale, final float delta) { | ||
| return MODIFY_SIZE_TYPE.getScaleData(scaleData.getEntity()).getScale(delta) * modifiedScale; | ||
| } | ||
| }); | ||
| private static <T> T register(Map<Identifier, T> registry, String name, T entry) { | ||
| return ScaleRegistries.register(registry, new Identifier(SpilaioOrigins.MODID, name), entry); | ||
| } | ||
| public static void init() { | ||
| MODIFY_SIZE_TYPE.getScaleChangedEvent().register(event -> { | ||
| Entity entity = event.getEntity(); | ||
| if (entity != null) { | ||
| boolean onGround = entity.isOnGround(); | ||
| entity.calculateDimensions(); | ||
| entity.setOnGround(onGround); | ||
| for (ScaleType type : ScaleRegistries.SCALE_TYPES.values()) { | ||
| ScaleData data = type.getScaleData(entity); | ||
| if (data.getBaseValueModifiers().contains(MODIFY_SIZE_MODIFIER)) { | ||
| data.markForSync(true); | ||
| } | ||
| } | ||
| } | ||
| }); | ||
| for (ScaleType type : MODIFY_SIZE_TYPES) { | ||
| type.getDefaultBaseValueModifiers().add(MODIFY_SIZE_MODIFIER); | ||
| } | ||
| } | ||
| */ | ||
|
|
||
| // public static void init() { | ||
| // MODIFY_SIZE_TYPE.getScaleChangedEvent().register(event -> { | ||
| // Entity entity = event.getEntity(); | ||
| // if (entity != null) { | ||
| // boolean onGround = entity.isOnGround(); | ||
| // entity.calculateDimensions(); | ||
| // entity.setOnGround(onGround); | ||
| // for (ScaleType type : ScaleRegistries.SCALE_TYPES.values()) { | ||
| // ScaleData data = type.getScaleData(entity); | ||
| // if (data.getBaseValueModifiers().contains(MODIFY_SIZE_MODIFIER)) { | ||
| // data.markForSync(true); | ||
| // } | ||
| // } | ||
| // } | ||
| // }); | ||
| // for (ScaleType type : MODIFY_SIZE_TYPES) { | ||
| // type.getDefaultBaseValueModifiers().add(MODIFY_SIZE_MODIFIER); | ||
| // } | ||
| // } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,17 @@ | ||
| package com.github.latokike.registry; | ||
|
|
||
| import com.github.latokike.SpilaioOrigins; | ||
| import net.fabricmc.fabric.api.tag.TagRegistry; | ||
| import net.minecraft.item.Item; | ||
| import net.minecraft.block.Block; | ||
| import net.minecraft.tag.Tag; | ||
| import net.minecraft.tag.TagKey; | ||
| import net.minecraft.util.Identifier; | ||
| import net.minecraft.util.registry.Registry; | ||
|
|
||
| public class ModTags { | ||
| public static final Tag<Item> GOLDEN_ARMOR = TagRegistry.item(new Identifier(SpilaioOrigins.MODID, "golden_armor")); | ||
| public static final Tag<Item> GOLDEN_TOOLS = TagRegistry.item(new Identifier(SpilaioOrigins.MODID, "golden_tools")); | ||
| public static final Tag<Item> NETHERITE_GOLD_TOOLS = TagRegistry.item(new Identifier(SpilaioOrigins.MODID, "netherite_gold_tools")); | ||
| public static final Tag<Item> ARMOR = TagRegistry.item(new Identifier(SpilaioOrigins.MODID, "armor")); | ||
| public static final Tag<Item> IRON_TOOLS = TagRegistry.item(new Identifier(SpilaioOrigins.MODID, "iron_tools")); | ||
| public static final Tag<Block> EDIBLE = TagRegistry.block(new Identifier(SpilaioOrigins.MODID, "edible")); | ||
| public static final TagKey<Item> GOLDEN_ARMOR = TagKey.of(Registry.ITEM_KEY,new Identifier(SpilaioOrigins.MODID, "golden_armor")); | ||
| public static final TagKey<Item> GOLDEN_TOOLS = TagKey.of(Registry.ITEM_KEY,new Identifier(SpilaioOrigins.MODID, "golden_tools")); | ||
| public static final TagKey<Item> NETHERITE_GOLD_TOOLS = TagKey.of(Registry.ITEM_KEY,new Identifier(SpilaioOrigins.MODID, "netherite_gold_tools")); | ||
| public static final TagKey<Item> ARMOR = TagKey.of(Registry.ITEM_KEY,new Identifier(SpilaioOrigins.MODID, "armor")); | ||
| public static final TagKey<Item> IRON_TOOLS = TagKey.of(Registry.ITEM_KEY, new Identifier(SpilaioOrigins.MODID, "iron_tools")); | ||
| public static final TagKey<Block> EDIBLE = TagKey.of(Registry.BLOCK_KEY, new Identifier(SpilaioOrigins.MODID, "edible")); | ||
| } |
Oops, something went wrong.