Skip to content

Commit

Permalink
oh gosh oh heck
Browse files Browse the repository at this point in the history
  • Loading branch information
Shnupbups committed Jul 1, 2020
1 parent 6ca9ab6 commit 300bd79
Show file tree
Hide file tree
Showing 135 changed files with 1,404 additions and 1,276 deletions.
12 changes: 6 additions & 6 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,26 @@ org.gradle.jvmargs = -Xmx4G

# Fabric
minecraft_version = 1.16.1
yarn_mappings = 1.16.1+build.17
loader_version = 0.8.8+build.202
yarn_mappings = 1.16.1+build.19
loader_version = 0.8.9+build.203

#Fabric api
api_version = 0.14.0+build.371-1.16
api_version = 0.14.1+build.372-1.16

# Mod
mod_name = astromine
mod_version = 1.0.17
mod_version = 1.0.18
mod_group = com.github.chainmailstudios
version_meta = fabric-1.16.1

# Dependency
cardinal_components_version = 2.4.1
spinnery_version = 3.0.48+fabric-1.16.x
shapes_version = 2.0.0+build.10
patchouli_version = 1.16-37.19-FABRIC
patchouli_version = 1.16-37.20-FABRIC
lba_version=0.7.0

# Conveniences
rei_version = 4.5.5
rei_version = 4.5.6
modmenu_version = 1.12.2+build.16
databreaker_version = -SNAPSHOT
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

import com.github.chainmailstudios.astromine.common.fraction.Fraction;
import com.github.chainmailstudios.astromine.common.volume.fluid.FluidVolume;
import com.github.chainmailstudios.astromine.registry.AstromineDimensionTypes;
import nerdhub.cardinal.components.api.component.Component;

import com.google.common.collect.Lists;
Expand Down Expand Up @@ -45,9 +46,9 @@ public void remove(BlockPos blockPos) {
public FluidVolume get(BlockPos position) {
RegistryKey<DimensionType> key = world.getDimensionRegistryKey();

boolean isVanilla = (key == DimensionType.OVERWORLD_REGISTRY_KEY || key == DimensionType.OVERWORLD_CAVES_REGISTRY_KEY || key == DimensionType.THE_NETHER_REGISTRY_KEY || key == DimensionType.THE_END_REGISTRY_KEY);
boolean isSpace = (key == AstromineDimensionTypes.SPACE_REGISTRY_KEY);

if (isVanilla && !volumes.containsKey(position)) {
if (!isSpace && !volumes.containsKey(position)) {
return FluidVolume.oxygen();
} else {
return volumes.getOrDefault(position, FluidVolume.empty());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@

import com.github.chainmailstudios.astromine.registry.AstromineSounds;

public class FireExtinguisher extends Item {
public class FireExtinguisherItem extends Item {
long lastPlayed = 0;

public FireExtinguisher(Item.Settings settings) {
public FireExtinguisherItem(Item.Settings settings) {
super(settings);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
import com.github.chainmailstudios.astromine.registry.AstromineSounds;
import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;

public class HolographicConnector extends Item {
public class HolographicConnectorItem extends Item {
public static final Object2ObjectArrayMap<World, Object> CACHE = new Object2ObjectArrayMap<>();

public HolographicConnector(Settings settings) {
public HolographicConnectorItem(Settings settings) {
super(settings);
}

Expand Down Expand Up @@ -62,12 +62,12 @@ public ActionResult useOnBlock(ItemUsageContext context) {

if ((parent.getPos().getX() != entity.getPos().getX() && parent.getPos().getZ() != entity.getPos().getZ()) || oP.getSquaredDistance(nP) > 65536) {
CACHE.put(world, null);
context.getPlayer().sendMessage(new TranslatableText("text.astromine.message.holographic_connection_failed", parent.getPos().toShortString(), entity.getPos().toShortString()).formatted(Formatting.RED), true);
context.getPlayer().sendMessage(new TranslatableText("text.astromine.message.holographic_connection_failed", toShortString(parent.getPos()), entity.getPos().toShortString()).formatted(Formatting.RED), true);
world.playSound(context.getPlayer(), context.getBlockPos(), AstromineSounds.HOLOGRAPHIC_CONNECTOR_CLICK, SoundCategory.PLAYERS, 0.5f, 0.33f);
return ActionResult.FAIL;
} else if (parent.getCachedState().get(HorizontalFacingBlock.FACING).getOpposite() != entity.getCachedState().get(HorizontalFacingBlock.FACING)) {
CACHE.put(world, null);
context.getPlayer().sendMessage(new TranslatableText("text.astromine.message.holographic_connection_failed", parent.getPos().toShortString(), entity.getPos().toShortString()).formatted(Formatting.RED), true);
context.getPlayer().sendMessage(new TranslatableText("text.astromine.message.holographic_connection_failed", toShortString(parent.getPos()), entity.getPos().toShortString()).formatted(Formatting.RED), true);
world.playSound(context.getPlayer(), context.getBlockPos(), AstromineSounds.HOLOGRAPHIC_CONNECTOR_CLICK, SoundCategory.PLAYERS, 0.5f, 0.33f);
return ActionResult.FAIL;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
import net.minecraft.util.registry.Registry;

import com.github.chainmailstudios.astromine.AstromineCommon;
import com.github.chainmailstudios.astromine.common.item.FireExtinguisher;
import com.github.chainmailstudios.astromine.common.item.HolographicConnector;
import com.github.chainmailstudios.astromine.common.item.FireExtinguisherItem;
import com.github.chainmailstudios.astromine.common.item.HolographicConnectorItem;
import com.github.chainmailstudios.astromine.common.item.MeteorSpawnerDevItem;
import com.github.chainmailstudios.astromine.common.item.SpaceSuitItem;
import com.github.chainmailstudios.astromine.common.item.SuperSpaceSlimeShooterItem;
Expand Down Expand Up @@ -51,7 +51,7 @@ public class AstromineItems {
public static final Item LAPUA_8_6_X_70_MM = register("lapua_8_6x70mm", new AmmunitionItem(getBasicSettings().fireproof().maxCount(1).maxDamage(6)));

// Realistic tooling
public static final Item FIRE_EXTINGUISHER = register("fire_extinguisher", new FireExtinguisher(getBasicSettings().maxCount(1)));
public static final Item FIRE_EXTINGUISHER = register("fire_extinguisher", new FireExtinguisherItem(getBasicSettings().maxCount(1)));

// Materials - Fragments
public static final Item ASTERITE_FRAGMENT = register("asterite_fragment", new Item(getBasicSettings()));
Expand Down Expand Up @@ -128,7 +128,7 @@ public class AstromineItems {
public static final Item ELITE_CIRCUIT = register("elite_circuit", new Item(getBasicSettings()));

// Tools
public static final Item HOLOGRAPHIC_CONNECTOR = register("holographic_connector", new HolographicConnector(getBasicSettings().maxCount(1)));
public static final Item HOLOGRAPHIC_CONNECTOR = register("holographic_connector", new HolographicConnectorItem(getBasicSettings().maxCount(1)));

public static final Item METITE_PICKAXE = register("metite_pickaxe", new PickaxeItem(AstromineToolMaterials.METITE, 1, -2.8f, getBasicSettings()));
public static final Item METITE_AXE = register("metite_axe", new AxeItem(AstromineToolMaterials.METITE, 5f, -3.0f, getBasicSettings()));
Expand Down
38 changes: 19 additions & 19 deletions src/main/resources/data/astromine/recipes/advanced_circuit.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
{
"type": "minecraft:crafting_shaped",
"pattern": ["121", "343", "121"],
"key": {
"1": {
"item": "minecraft:red_dye"
},
"2": {
"item": "astromine:iron_plates"
},
"3": {
"item": "astromine:diamond_dust"
},
"4": {
"item": "astromine:gold_plates"
}
},
"result": {
"item": "astromine:advanced_circuit"
}
"type": "minecraft:crafting_shaped",
"pattern": ["121", "343", "121"],
"key": {
"1": {
"item": "minecraft:red_dye"
},
"2": {
"item": "astromine:iron_plates"
},
"3": {
"item": "astromine:diamond_dust"
},
"4": {
"item": "astromine:gold_plates"
}
},
"result": {
"item": "astromine:advanced_circuit"
}
}
26 changes: 13 additions & 13 deletions src/main/resources/data/astromine/recipes/asterite_axe.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"type": "minecraft:crafting_shaped",
"pattern": ["##", "#$", " $"],
"key": {
"#": {
"item": "astromine:asterite"
},
"$": {
"item": "minecraft:stick"
}
},
"result": {
"item": "astromine:asterite_axe"
}
"type": "minecraft:crafting_shaped",
"pattern": ["##", "#$", " $"],
"key": {
"#": {
"item": "astromine:asterite"
},
"$": {
"item": "minecraft:stick"
}
},
"result": {
"item": "astromine:asterite_axe"
}
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"type": "minecraft:crafting_shaped",
"pattern": ["###", "###", "###"],
"key": {
"#": {
"item": "astromine:asterite"
}
},
"result": {
"item": "astromine:asterite_block"
}
"type": "minecraft:crafting_shaped",
"pattern": ["###", "###", "###"],
"key": {
"#": {
"item": "astromine:asterite"
}
},
"result": {
"item": "astromine:asterite_block"
}
}
20 changes: 10 additions & 10 deletions src/main/resources/data/astromine/recipes/asterite_boots.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"type": "minecraft:crafting_shaped",
"pattern": ["# #", "# #"],
"key": {
"#": {
"item": "astromine:asterite"
}
},
"result": {
"item": "astromine:asterite_boots"
}
"type": "minecraft:crafting_shaped",
"pattern": ["# #", "# #"],
"key": {
"#": {
"item": "astromine:asterite"
}
},
"result": {
"item": "astromine:asterite_boots"
}
}
20 changes: 10 additions & 10 deletions src/main/resources/data/astromine/recipes/asterite_chestplate.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"type": "minecraft:crafting_shaped",
"pattern": ["###", "###", "# #"],
"key": {
"#": {
"item": "astromine:asterite"
}
},
"result": {
"item": "astromine:asterite_chestplate"
}
"type": "minecraft:crafting_shaped",
"pattern": ["###", "###", "# #"],
"key": {
"#": {
"item": "astromine:asterite"
}
},
"result": {
"item": "astromine:asterite_chestplate"
}
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "astromine:asterite"
}
],
"result": {
"item": "astromine:asterite_fragment",
"count": 9
}
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "astromine:asterite"
}
],
"result": {
"item": "astromine:asterite_fragment",
"count": 9
}
}
20 changes: 10 additions & 10 deletions src/main/resources/data/astromine/recipes/asterite_from_block.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "astromine:asterite_block"
}
],
"result": {
"item": "astromine:asterite",
"count": 9
}
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "astromine:asterite_block"
}
],
"result": {
"item": "astromine:asterite",
"count": 9
}
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"type": "minecraft:crafting_shaped",
"pattern": ["###", "###", "###"],
"key": {
"#": {
"item": "astromine:asterite_fragment"
}
},
"result": {
"item": "astromine:asterite"
}
"type": "minecraft:crafting_shaped",
"pattern": ["###", "###", "###"],
"key": {
"#": {
"item": "astromine:asterite_fragment"
}
},
"result": {
"item": "astromine:asterite"
}
}
20 changes: 10 additions & 10 deletions src/main/resources/data/astromine/recipes/asterite_helmet.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"type": "minecraft:crafting_shaped",
"pattern": ["###", "# #"],
"key": {
"#": {
"item": "astromine:asterite"
}
},
"result": {
"item": "astromine:asterite_helmet"
}
"type": "minecraft:crafting_shaped",
"pattern": ["###", "# #"],
"key": {
"#": {
"item": "astromine:asterite"
}
},
"result": {
"item": "astromine:asterite_helmet"
}
}
26 changes: 13 additions & 13 deletions src/main/resources/data/astromine/recipes/asterite_hoe.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"type": "minecraft:crafting_shaped",
"pattern": ["##", " $", " $"],
"key": {
"#": {
"item": "astromine:asterite"
},
"$": {
"item": "minecraft:stick"
}
},
"result": {
"item": "astromine:asterite_hoe"
}
"type": "minecraft:crafting_shaped",
"pattern": ["##", " $", " $"],
"key": {
"#": {
"item": "astromine:asterite"
},
"$": {
"item": "minecraft:stick"
}
},
"result": {
"item": "astromine:asterite_hoe"
}
}
Loading

0 comments on commit 300bd79

Please sign in to comment.