Skip to content

Commit 5f1f53e

Browse files
RyoramaRyorama
committed
Stuff
1 parent af8715e commit 5f1f53e

File tree

21 files changed

+130
-150
lines changed

21 files changed

+130
-150
lines changed

‎build.gradle

+29-11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
plugins {
22
id "architectury-plugin" version "3.4-SNAPSHOT"
3-
id "dev.architectury.loom" version "0.12.0-SNAPSHOT" apply false
3+
id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false
4+
id "io.github.pacifistmc.forgix" version "1.2.9"
45
}
56

67
architectury {
@@ -9,10 +10,7 @@ architectury {
910

1011
subprojects {
1112
apply plugin: "dev.architectury.loom"
12-
13-
loom {
14-
silentMojangMappingsLicense()
15-
}
13+
apply plugin: 'architectury-plugin'
1614

1715
repositories {
1816
maven { url 'https://dl.cloudsmith.io/public/geckolib3/geckolib/maven/' }
@@ -24,6 +22,20 @@ subprojects {
2422
minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
2523
mappings "net.fabricmc:yarn:${rootProject.yarn_mappings}:v2"
2624
}
25+
26+
build.finalizedBy(mergeJars)
27+
assemble.finalizedBy(mergeJars)
28+
29+
java {
30+
withSourcesJar()
31+
32+
sourceCompatibility = JavaVersion.VERSION_17
33+
targetCompatibility = JavaVersion.VERSION_17
34+
}
35+
36+
tasks.withType(JavaCompile).configureEach {
37+
it.options.release = 17
38+
}
2739
}
2840

2941
allprojects {
@@ -34,17 +46,23 @@ allprojects {
3446
archivesBaseName = rootProject.archives_base_name
3547
version = rootProject.mod_version
3648
group = rootProject.maven_group
49+
}
3750

38-
repositories {
51+
forgix {
52+
group = rootProject.groupId
53+
mergedJarName = "${rootProject.name}-${rootProject.version}-universal.jar"
54+
outputDir = "build/libs"
3955

56+
forge {
57+
jarLocation = "build/libs/${rootProject.name}-${rootProject.version}.jar"
58+
mixin "terrariamod.mixins.json"
4059
}
4160

42-
tasks.withType(JavaCompile) {
43-
options.encoding = "UTF-8"
44-
options.release = 17
61+
fabric {
62+
jarLocation = "build/libs/${rootProject.name}-${rootProject.version}.jar"
4563
}
4664

47-
java {
48-
withSourcesJar()
65+
quilt {
66+
jarLocation = "build/libs/${rootProject.name}-${rootProject.version}.jar"
4967
}
5068
}

‎common/src/main/java/com/ryorama/terrariamod/TerrariaMod.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ public static void init() {
3232
CONFIG = AutoConfig.getConfigHolder(TerrariaModConfig.class).getConfig();
3333
CHUNK_GENERATORS.register();
3434
BuffsT.init();
35-
BlocksT.init();
3635
EntitiesT.init();
36+
BlocksT.init();
3737
ItemsT.init();
3838
}
3939

‎common/src/main/java/com/ryorama/terrariamod/TerrariaModConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ public class TerrariaModConfig implements ConfigData {
1717
@ConfigEntry.Gui.Tooltip
1818
public boolean useCustomTitles = false;
1919
@ConfigEntry.Gui.Tooltip
20-
public boolean replaceSpecialDamageWithDebuffs = false;
20+
public boolean replaceSpecialDamageWithDebuffs = true;
2121
}

‎common/src/main/java/com/ryorama/terrariamod/blocks/impl/HotBlockT.java

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ public HotBlockT(Settings properties, float hardness, float difficulty) {
1414
super(properties, hardness, difficulty);
1515
}
1616

17+
@Override
1718
public void onSteppedOn(World world, BlockPos pos, BlockState state, Entity entity) {
1819
if (!entity.bypassesSteppingEffects() && entity instanceof LivingEntity && !EnchantmentHelper.hasFrostWalker((LivingEntity) entity)) {
1920
if (TerrariaMod.CONFIG.replaceSpecialDamageWithDebuffs) {

‎common/src/main/java/com/ryorama/terrariamod/blocks/terraria/world/GrassBlockT.java

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ public void randomTick(BlockState state, ServerWorld world, BlockPos pos, Random
2020
if (!world.isClient()) {
2121
if (!world.isChunkLoaded(pos)) return;
2222
BlockPos pos2 = pos.add(0, 1, 0);
23-
System.out.println("Is " + world.getBlockState(pos2).getBlock().getName() + " Solid: " + world.getBlockState(pos2).isSolid());
2423
if (world.getBlockState(pos2).isSolid()) {
2524
world.setBlockState(pos, BlocksT.DIRT_BLOCK.get().getDefaultState());
2625
return;

‎common/src/main/java/com/ryorama/terrariamod/entities/renderers/hostile/RenderDemonEye.java

+1-10
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,16 @@
11
package com.ryorama.terrariamod.entities.renderers.hostile;
22

33
import com.ryorama.terrariamod.entities.models.hostile.ModelDemonEye;
4-
import com.ryorama.terrariamod.entities.models.hostile.slime.ModelBlueSlime;
54
import com.ryorama.terrariamod.entities.terraria.hostile.EntityDemonEye;
6-
import com.ryorama.terrariamod.entities.terraria.hostile.slime.EntityBlueSlime;
75
import net.minecraft.client.render.RenderLayer;
8-
import net.minecraft.client.render.VertexConsumer;
96
import net.minecraft.client.render.VertexConsumerProvider;
107
import net.minecraft.client.render.entity.EntityRendererFactory;
11-
import net.minecraft.client.util.math.MatrixStack;
128
import net.minecraft.util.Identifier;
13-
import software.bernie.geckolib.cache.object.BakedGeoModel;
9+
import org.jetbrains.annotations.Nullable;
1410
import software.bernie.geckolib.renderer.DynamicGeoEntityRenderer;
1511

16-
import javax.annotation.Nullable;
17-
import java.util.Random;
18-
1912
public class RenderDemonEye extends DynamicGeoEntityRenderer<EntityDemonEye> {
2013

21-
public Random rand = new Random();
22-
2314
private Identifier[] eyeTexture = {
2415
new Identifier("terrariamod:textures/entity/eyes/eye.png"),
2516
new Identifier("terrariamod:textures/entity/eyes/eye_cataract.png"),

‎common/src/main/java/com/ryorama/terrariamod/entities/renderers/hostile/slime/RenderBlueSlime.java

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,18 @@
11
package com.ryorama.terrariamod.entities.renderers.hostile.slime;
22

3-
import com.ryorama.terrariamod.TerrariaMod;
43
import com.ryorama.terrariamod.entities.models.hostile.slime.ModelBlueSlime;
54

65
import com.ryorama.terrariamod.entities.terraria.hostile.slime.EntityBlueSlime;
7-
import com.ryorama.terrariamod.entities.terraria.hostile.slime.EntityGreenSlime;
86
import net.minecraft.client.render.RenderLayer;
97
import net.minecraft.client.render.VertexConsumer;
108
import net.minecraft.client.render.VertexConsumerProvider;
119
import net.minecraft.client.render.entity.EntityRendererFactory;
1210
import net.minecraft.client.util.math.MatrixStack;
1311
import net.minecraft.util.Identifier;
12+
import org.jetbrains.annotations.Nullable;
1413
import software.bernie.geckolib.cache.object.BakedGeoModel;
15-
import software.bernie.geckolib.cache.object.GeoBone;
1614
import software.bernie.geckolib.renderer.DynamicGeoEntityRenderer;
1715

18-
import javax.annotation.Nullable;
19-
2016
public class RenderBlueSlime extends DynamicGeoEntityRenderer<EntityBlueSlime> {
2117

2218
public RenderBlueSlime(EntityRendererFactory.Context context) {

‎common/src/main/java/com/ryorama/terrariamod/entities/renderers/hostile/slime/RenderGreenSlime.java

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,14 @@
11
package com.ryorama.terrariamod.entities.renderers.hostile.slime;
22

33
import com.ryorama.terrariamod.entities.models.hostile.slime.ModelGreenSlime;
4-
import com.ryorama.terrariamod.entities.terraria.hostile.slime.EntityBlueSlime;
54
import com.ryorama.terrariamod.entities.terraria.hostile.slime.EntityGreenSlime;
65
import net.minecraft.client.render.RenderLayer;
7-
import net.minecraft.client.render.VertexConsumer;
86
import net.minecraft.client.render.VertexConsumerProvider;
97
import net.minecraft.client.render.entity.EntityRendererFactory;
10-
import net.minecraft.client.util.math.MatrixStack;
118
import net.minecraft.util.Identifier;
12-
import software.bernie.geckolib.cache.object.BakedGeoModel;
13-
import software.bernie.geckolib.cache.object.GeoBone;
9+
import org.jetbrains.annotations.Nullable;
1410
import software.bernie.geckolib.renderer.DynamicGeoEntityRenderer;
1511

16-
import javax.annotation.Nullable;
17-
1812
public class RenderGreenSlime extends DynamicGeoEntityRenderer<EntityGreenSlime> {
1913
public RenderGreenSlime(EntityRendererFactory.Context context) {
2014
super(context, new ModelGreenSlime());

‎common/src/main/java/com/ryorama/terrariamod/items/ItemsT.java

+8-10
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@
3131
import java.util.function.Supplier;
3232

3333
public class ItemsT {
34-
public static List<Item> fixedRenders = new ArrayList<>();
35-
3634
public static final DeferredRegister<Item> ITEMS = DeferredRegister.create(TerrariaMod.MOD_ID, RegistryKeys.ITEM);
3735
public static final DeferredRegister<ItemGroup> ITEM_GROUPS = DeferredRegister.create(TerrariaMod.MOD_ID, RegistryKeys.ITEM_GROUP);
3836

@@ -167,11 +165,6 @@ public class ItemsT {
167165
public static final RegistrySupplier<Item> LESSER_HEALING_POTION = register("lesser_healing_potion", () -> new LesserHealingPotion(new Item.Settings()).setRarity(2).isConsumable(true));
168166
public static final RegistrySupplier<Item> HEALING_POTION = register("healing_potion", () -> new HealingPotion(new Item.Settings()).setRarity(2).isConsumable(true));
169167

170-
public static final RegistrySupplier<Item> GREEN_SLIME_SPAWN_EGG = register("green_slime_spawn_egg", () -> new SpawnEggItem(EntitiesT.GREEN_SLIME.get(), 0x2ec221, 0x5fed53, new Item.Settings().arch$tab(TERRARIAMOD_GROUP)));
171-
public static final RegistrySupplier<Item> BLUE_SLIME_SPAWN_EGG = register("blue_slime_spawn_egg", () -> new SpawnEggItem(EntitiesT.BLUE_SLIME.get(), 0x2f7dc4, 0x53a3ed, new Item.Settings().arch$tab(TERRARIAMOD_GROUP)));
172-
public static final RegistrySupplier<Item> DEMON_EYE_SPAWN_EGG = register("demon_eye_spawn_egg", () -> new SpawnEggItem(EntitiesT.DEMON_EYE.get(), 0xffffff, 0xff0000, new Item.Settings().arch$tab(TERRARIAMOD_GROUP)));
173-
174-
175168
public static final RegistrySupplier<Item> GRASS_BLOCK = register("grass_block", () -> new BlockItemT(BlocksT.GRASS_BLOCK.get(), new Item.Settings().maxCount(64)).setRarity(2));
176169
public static final RegistrySupplier<Item> CORRUPTED_GRASS_BLOCK = register("corrupted_grass", () -> new BlockItemT(BlocksT.CORRUPTED_GRASS_BLOCK.get(), new Item.Settings().maxCount(64)).setRarity(2));
177170
public static final RegistrySupplier<Item> CRIMSON_GRASS_BLOCK = register("crimson_grass", () -> new BlockItemT(BlocksT.CRIMSON_GRASS_BLOCK.get(), new Item.Settings().maxCount(64)).setRarity(2));
@@ -235,12 +228,17 @@ public class ItemsT {
235228
public static final RegistrySupplier<Item> SKYWARE_CHEST = register("skyware_chest", () -> new BlockItemT(BlocksT.SKYWARE_CHEST.get(), new Item.Settings().maxCount(64)));
236229
public static final RegistrySupplier<Item> WATER_CHEST = register("water_chest", () -> new BlockItemT(BlocksT.WATER_CHEST.get(), new Item.Settings().maxCount(64)));
237230

231+
//public static RegistrySupplier<Item> GREEN_SLIME_SPAWN_EGG;
232+
//public static RegistrySupplier<Item> BLUE_SLIME_SPAWN_EGG;
233+
//public static RegistrySupplier<Item> DEMON_EYE_SPAWN_EGG;
234+
238235
public static void init() {
236+
//GREEN_SLIME_SPAWN_EGG = register("green_slime_spawn_egg", () -> new SpawnEggItem(EntitiesT.GREEN_SLIME.get(), 0x2ec221, 0x5fed53, new Item.Settings().arch$tab(TERRARIAMOD_GROUP)));
237+
//BLUE_SLIME_SPAWN_EGG = register("blue_slime_spawn_egg", () -> new SpawnEggItem(EntitiesT.BLUE_SLIME.get(), 0x2f7dc4, 0x53a3ed, new Item.Settings().arch$tab(TERRARIAMOD_GROUP)));
238+
//DEMON_EYE_SPAWN_EGG = register("demon_eye_spawn_egg", () -> new SpawnEggItem(EntitiesT.DEMON_EYE.get(), 0xffffff, 0xff0000, new Item.Settings().arch$tab(TERRARIAMOD_GROUP)));
239+
239240
ITEMS.register();
240241
ITEM_GROUPS.register();
241-
242-
fixedRenders.add(LIGHTS_BANE.get());
243-
fixedRenders.add(CRIMTANE_AXE.get());
244242
}
245243

246244
static RegistrySupplier<ItemGroup> registerTab(String name, Supplier<ItemGroup> group) {

‎common/src/main/java/com/ryorama/terrariamod/mixin/EntityMixin.java

+12-2
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,19 @@ public void setOnFireFromLava(CallbackInfo ci) {
2626
if (TerrariaMod.CONFIG.replaceSpecialDamageWithDebuffs) {
2727
fireTicks = 0;
2828
if (((Entity) (Object) this) instanceof LivingEntity) {
29-
BuffsT.AddBuffToEntity(((LivingEntity)(Object)this), 1, BuffsT.ON_FIRE);
29+
BuffsT.AddBuffToEntity(((LivingEntity) (Object) this), 1, BuffsT.ON_FIRE);
3030
}
31-
ci.cancel();
31+
return;
32+
}
33+
}
34+
35+
@Inject(at = @At("HEAD"), method = "setOnFireFor")
36+
public void setOnFireFor(int seconds, CallbackInfo ci) {
37+
if (TerrariaMod.CONFIG.replaceSpecialDamageWithDebuffs) {
38+
if (((Entity) (Object) this) instanceof LivingEntity) {
39+
BuffsT.AddBuffToEntity(((LivingEntity) (Object) this), 1, BuffsT.ON_FIRE);
40+
}
41+
return;
3242
}
3343
}
3444
}

‎common/src/main/java/com/ryorama/terrariamod/mixin/LivingEntityMixin.java

+5-15
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@ public abstract class LivingEntityMixin extends Entity implements Attackable, Cu
2424
public List<BuffT> activeBuffs = new ArrayList<>();
2525
public List<Identifier> activeBuffsIcons = new ArrayList<>();
2626

27-
public Entity thisEntity;
28-
29-
public LivingEntity thisLivingEntity;
30-
3127
public boolean calledBuffIconRenderer = false;
3228

3329
public LivingEntityMixin(EntityType<?> type, World world) {
@@ -36,30 +32,24 @@ public LivingEntityMixin(EntityType<?> type, World world) {
3632

3733
@Inject(at = @At("TAIL"), method = "tick")
3834
public void tick(CallbackInfo info) {
39-
thisEntity = this.getEntityWorld().getEntityById(this.getId());
40-
41-
if (thisEntity != null) {
42-
if(thisEntity instanceof LivingEntity) {
43-
thisLivingEntity = (LivingEntity) this.getEntityWorld().getEntityById(this.getId());
44-
}
45-
}
35+
LivingEntity thisEntity = ((LivingEntity) (Object) this);
4636

47-
if (this.thisLivingEntity instanceof PlayerEntity) {
48-
PlayerEntity player = (PlayerEntity) thisLivingEntity;
37+
if (thisEntity instanceof PlayerEntity) {
38+
PlayerEntity player = (PlayerEntity) thisEntity;
4939
World playerWorld = player.getWorld();
5040

5141
if (playerWorld.isClient()) {
5242
if (player.isMainPlayer()) {
5343
if (!calledBuffIconRenderer) {
54-
BuffT.renderIcon(thisLivingEntity);
44+
BuffT.renderIcon(thisEntity);
5545
calledBuffIconRenderer = true;
5646
}
5747
}
5848
}
5949
}
6050

6151
for (int b = 0; b < activeBuffs.size(); b++) {
62-
activeBuffs.get(b).tick(thisLivingEntity);
52+
activeBuffs.get(b).tick(thisEntity);
6353
if (activeBuffs.get(b).getDuration() <= 0) {
6454
RemoveBuff(activeBuffs.get(b));
6555
return;

‎common/src/main/java/com/ryorama/terrariamod/world/TerrariaChunkGenerator.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ public void generateFeatures(StructureWorldAccess world, Chunk chunk, StructureA
323323

324324
//Misc
325325
if (y <= -5) {
326-
if (world.getRandom().nextInt(3500) == 0) {
326+
if (world.getRandom().nextInt(1500) == 0) {
327327
if (world.getBlockState(pos) == Blocks.AIR.getDefaultState()) {
328328
if (world.getBlockState(new BlockPos(pos.getX(), pos.getY() - 1, pos.getZ())) == BlocksT.STONE_BLOCK.get().getDefaultState()) {
329329
placeStuff(world, BlocksT.LIFE_CRYSTAL_BLOCK.get().getDefaultState(), world.getRandom(), pos);
@@ -841,10 +841,9 @@ private boolean GeneratePurityTrees(StructureWorldAccess world, int x, int y, in
841841
private boolean GenerateGiantMushroom(StructureWorldAccess world, int x, int y, int z, BlockPos.Mutable pos) {
842842
pos.set(x, y, z);
843843
if (world.getBlockState(pos).getBlock() == BlocksT.MUSHROOM_GRASS.get()) {
844-
int height = world.getRandom().nextInt(4) + 2
845-
;
844+
int height = world.getRandom().nextInt(4) + 2;
846845
for (int h = 0; h <= height; h++) {
847-
if (world.getBlockState(new BlockPos(pos.getX(), pos.getY() + h, pos.getZ())) != Blocks.AIR.getDefaultState()) {
846+
if (world.getBlockState(new BlockPos(pos.getX(), pos.getY() + h, pos.getZ())) != Blocks.AIR.getDefaultState() || world.getBlockState(new BlockPos(pos.getX(), pos.getY() + h, pos.getZ())) != Blocks.CAVE_AIR.getDefaultState()) {
848847
return false;
849848
}
850849
}

‎common/src/main/resources/assets/terrariamod/lang/en_us.json

+11-2
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,6 @@
280280
"item.terrariamod.hellfire_arrow": "Hellfire Arrow",
281281
"item.terrariamod.grenade": "Grenade",
282282
"item.terrariamod.glowstick": "Glowstick",
283-
"item.terrariamod.acorn": "Acorn",
284283
"item.terrariamod.bomb": "Bomb",
285284
"item.terrariamod.rope_coil": "Rope Coil",
286285
"item.terrariamod.musket": "Musket",
@@ -327,6 +326,17 @@
327326
"item.terrariamod.wooden_hammer": "Wooden Hammer",
328327
"item.terrariamod.meteorite_bar": "Meteorite Bar",
329328
"item.terrariamod.space_gun": "Space Gun",
329+
"item.terrariamod.mushroom": "Mushroom",
330+
"item.terrariamod.blinkroot": "Brinkroot",
331+
"item.terrariamod.daybloom": "Daybloom",
332+
"item.terrariamod.deathweed": "Deathweed",
333+
"item.terrariamod.fireblossom": "Fireblossom",
334+
"item.terrariamod.moonglow": "Moonglow",
335+
"item.terrariamod.shiverthorn": "Shiverthorn",
336+
"item.terrariamod.waterleaf": "Waterleaf",
337+
"item.terrariamod.jungle_spores": "Jungle Spore",
338+
"item.terrariamod.vile_mushroom": "Vile Mushroom",
339+
"item.terrariamod.vicious_mushroom": "Vicious Mushroom",
330340
"block.terrariamod.meteorite_ore": "Meteorite",
331341
"block.terrariamod.shadow_orb": "Shadow Orb",
332342
"block.terrariamod.rope": "Rope",
@@ -397,7 +407,6 @@
397407
"block.terrariamod.life_crystal_block": "Life Crystal",
398408
"block.terrariamod.grass_block": "Grass Block",
399409
"block.terrariamod.corrupted_grass": "Corruption Grass",
400-
"block.terrariamod.crimson_grass": "Crimson Grass",
401410
"block.terrariamod.grass_path": "Grass Path",
402411
"block.terrariamod.furnace": "Furnace",
403412
"block.terrariamod.torch": "Torch",

‎common/src/main/resources/terrariamod.mixins.json

+3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
{
22
"required": true,
33
"package": "com.ryorama.terrariamod.mixin",
4+
"minVersion": "0.7",
45
"compatibilityLevel": "JAVA_17",
56
"mixins": [
7+
"BooleanValueInvoker",
8+
"IntValueInvoker",
69
"FlowingMixin",
710
"LavaFluidMixin",
811
"WaterFluidMixin",

0 commit comments

Comments
 (0)